From b9a58e819a4e1935c0ba3dddb328c197694acb95 Mon Sep 17 00:00:00 2001 From: hzyangjiapeng Date: Fri, 9 Sep 2016 16:31:21 +0800 Subject: [PATCH 1/3] Bugfix:donot throw RuntimeException when a error occured in awaitCompletion(long,TimeUnit) --- .../github/dockerjava/core/async/ResultCallbackTemplate.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java index f120012af..3298be24f 100644 --- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java +++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java @@ -99,7 +99,9 @@ public RC_T awaitCompletion() throws InterruptedException { * before {@link ResultCallback#onComplete()} was called. */ public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException { - return completed.await(timeout, timeUnit); + boolean result = completed.await(timeout, timeUnit); + getFirstError(); + return result; } /** From 81f0ede02d0eaffc4edf2331a0631cf4d46dc1eb Mon Sep 17 00:00:00 2001 From: hzyangjiapeng Date: Sat, 10 Sep 2016 00:07:50 +0800 Subject: [PATCH 2/3] Fix indentation --- .../github/dockerjava/core/async/ResultCallbackTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java index 3298be24f..5221c832e 100644 --- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java +++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java @@ -101,7 +101,7 @@ public RC_T awaitCompletion() throws InterruptedException { public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException { boolean result = completed.await(timeout, timeUnit); getFirstError(); - return result; + return result; } /** From 02a07f85fe0960d5ca4c5273b8df4a9728469161 Mon Sep 17 00:00:00 2001 From: hzyangjiapeng Date: Sat, 10 Sep 2016 00:16:00 +0800 Subject: [PATCH 3/3] fix format error,use docker-java-formatter.xml --- .../dockerjava/core/async/ResultCallbackTemplate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java index 5221c832e..2437fc878 100644 --- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java +++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java @@ -99,9 +99,9 @@ public RC_T awaitCompletion() throws InterruptedException { * before {@link ResultCallback#onComplete()} was called. */ public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException { - boolean result = completed.await(timeout, timeUnit); - getFirstError(); - return result; + boolean result = completed.await(timeout, timeUnit); + getFirstError(); + return result; } /**