Ignore exception while closing stream to let awaitCompletion finish before time-out (docker-java#1149)

pskowronek · KostyaSha · commit 76053ab0d542 · 2019-01-17T23:59:18.000+03:00
* Ignore exception while closing stream to let awaitCompletion finish before time-out

* Ensure completed#countDown is called even if exception is thrown while closing stream
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -74,10 +74,13 @@ public void onComplete() {
     public void close() throws IOException {
         if (!closed) {
            closed = true;
-           if (stream != null) {
-               stream.close();
+           try {
+               if (stream != null) {
+                   stream.close();
+               }
+           } finally {
+               completed.countDown();
            }
-           completed.countDown();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,13 @@ public void onComplete() {`
`74`	`74`	`public void close() throws IOException {`
`75`	`75`	`if (!closed) {`
`76`	`76`	`closed = true;`
`77`		`- if (stream != null) {`
`78`		`- stream.close();`
	`77`	`+ try {`
	`78`	`+ if (stream != null) {`
	`79`	`+ stream.close();`
	`80`	`+ }`
	`81`	`+ } finally {`
	`82`	`+ completed.countDown();`
`79`	`83`	`}`
`80`		`- completed.countDown();`
`81`	`84`	`}`
`82`	`85`	`}`
`83`	`86`