fix issue docker-java#303

Marcus Linke · Marcus Linke · commit c231b8d09fa3 · 2015-08-24T21:46:32.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -4,4 +4,7 @@
 
 public interface DockerCmd<RES_T> extends Closeable {
 
+    @Override
+    public void close();
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -25,7 +25,7 @@ public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback) {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -34,7 +34,7 @@ public RES_T exec() throws DockerException {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
     }
 
     protected String registryAuth(AuthConfig authConfig) {
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -197,10 +197,14 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
         super.close();
 
-        tarInputStream.close();
+        try {
+            tarInputStream.close();
+        } catch (IOException e) {
+           throw new RuntimeException(e);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
@@ -50,11 +50,7 @@ public void onError(Throwable throwable) {
             @Override
             public void onComplete() {
                 resultCallback.onComplete();
-                try {
-                    command.close();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
+                command.close();
             }
         };
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
@@ -19,25 +19,17 @@ public AbstrSyncDockerCmdExec(WebTarget baseResource) {
     @Override
     public RES_T exec(CMD_T command) {
         // this hack works because of ResponseStatusExceptionFilter
-        RES_T result;
-        try {
-            result = execute(command);
-
-        } catch (ProcessingException e) {
-            if (e.getCause() instanceof DockerException) {
-                throw (DockerException) e.getCause();
-            } else {
-                throw e;
-            }
-        } finally {
+        try (CMD_T cmd = command) {
             try {
-                command.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
+                return execute(cmd);
+            } catch (ProcessingException e) {
+                if (e.getCause() instanceof DockerException) {
+                    throw (DockerException) e.getCause();
+                } else {
+                    throw e;
+                }
             }
         }
-
-        return result;
     }
 
     protected abstract RES_T execute(CMD_T command);

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,7 @@`
`4`	`4`
`5`	`5`	`public interface DockerCmd<RES_T> extends Closeable {`
`6`	`6`
	`7`	`+ @Override`
	`8`	`+ public void close();`
	`9`	`+`
`7`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`		`- public void close() throws IOException {`
	`28`	`+ public void close() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public RES_T exec() throws DockerException {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public void close() throws IOException {`
	`37`	`+ public void close() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`protected String registryAuth(AuthConfig authConfig) {`
Original file line number	Diff line number	Diff line change
`@@ -197,10 +197,14 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`@Override`
`200`		`- public void close() throws IOException {`
	`200`	`+ public void close() {`
`201`	`201`	`super.close();`
`202`	`202`
`203`		`- tarInputStream.close();`
	`203`	`+ try {`
	`204`	`+ tarInputStream.close();`
	`205`	`+ } catch (IOException e) {`
	`206`	`+ throw new RuntimeException(e);`
	`207`	`+ }`
`204`	`208`	`}`
`205`	`209`
`206`	`210`	`@Override`