githubcpc
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎pom.xml‎
Lines changed: 14 additions & 15 deletions b/‎pom.xml‎
Lines changed: 14 additions & 15 deletions
diff --git a/‎src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java‎
Lines changed: 6 additions & 4 deletions b/‎src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java‎
Lines changed: 4 additions & 1 deletion b/‎src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java‎
Lines changed: 4 additions & 1 deletion
@@ -21,4 +21,5 @@ target
 *.log
 
 #Ignore Test Output
-test-output
+test-output
+/.checkstyle
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -67,7 +68,7 @@
 		<slf4j-api.version>1.7.21</slf4j-api.version>
 
 		<bouncycastle.version>1.54</bouncycastle.version>
-		<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
+		<junixsocket.version>2.0.4</junixsocket.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
@@ -115,11 +116,15 @@
 			<version>${jersey.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>de.gesellix</groupId>
-			<artifactId>unix-socket-factory</artifactId>
-			<version>${unix-socket-factory.version}</version>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-common</artifactId>
+			<version>${junixsocket.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-native-common</artifactId>
+			<version>${junixsocket.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
@@ -266,13 +271,6 @@
 	</distributionManagement>
 
 	<build>
-<!-- 		<extensions> -->
-<!-- 			<extension> -->
-<!-- 				<groupId>kr.motd.maven</groupId> -->
-<!-- 				<artifactId>os-maven-plugin</artifactId> -->
-<!-- 				<version>1.2.3.Final</version> -->
-<!-- 			</extension> -->
-<!-- 		</extensions> -->
 		<pluginManagement>
 			<plugins>
 
@@ -419,7 +417,7 @@
 							<perCoreThreadCount>true</perCoreThreadCount>
 							<threadCount>1</threadCount>
 							<groups>integration</groups>
- 							<excludedGroups>integration-auth</excludedGroups>
+							<excludedGroups>integration-auth</excludedGroups>
 							<includes>
 								<include>**/*Test.java</include>
 							</includes>
@@ -483,7 +481,8 @@
 							<failOnViolation>true</failOnViolation>
 							<logViolationsToConsole>true</logViolationsToConsole>
 							<linkXRef>false</linkXRef>
-							<!-- if some IDE has integration and requires other place, propose it -->
+							<!-- if some IDE has integration and requires other place, propose 
+								it -->
 							<configLocation>
 								src/test/resources/checkstyle/checkstyle-config.xml
 							</configLocation>
 
@@ -75,11 +75,13 @@ public void onComplete() {
 
     @Override
     public void close() throws IOException {
-        closed = true;
-        if (stream != null) {
-            stream.close();
+        if (!closed) {
+           closed = true;
+           if (stream != null) {
+               stream.close();
+           }
+           completed.countDown();
         }
-        completed.countDown();
     }
 
     /**
 
@@ -53,9 +53,12 @@ public int available() throws IOException {
     }
 
     public void close() throws IOException {
+        if (closed) {
+            return;
+        }
         closed = true;
-        response.close();
         delegate.close();
+        response.close();
     }
 
     public void mark(int readlimit) {
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,12 @@ public int available() throws IOException {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public void close() throws IOException {`
	`56`	`+ if (closed) {`
	`57`	`+ return;`
	`58`	`+ }`
`56`	`59`	`closed = true;`
`57`		`- response.close();`
`58`	`60`	`delegate.close();`
	`61`	`+ response.close();`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`public void mark(int readlimit) {`