Ensure errors in callback are processed and logged

carlossg · carlossg · commit 87e9c19729a7 · 2015-07-13T09:55:56.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -8,6 +8,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.github.dockerjava.api.async.ResultCallback;
 
 /**
@@ -18,6 +21,8 @@
  */
 public abstract class ResultCallbackTemplate<T> implements ResultCallback<T> {
 
+    private final static Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
+
     private final CountDownLatch finished = new CountDownLatch(1);
 
     private Closeable stream;
@@ -34,6 +39,7 @@ public void onNext(T object) {
     @Override
     public void onError(Throwable throwable) {
         try {
+            LOGGER.error("Error during callback", throwable);
             throw new RuntimeException(throwable);
         } finally {
             try {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -48,6 +48,11 @@ public Void call() throws Exception {
                 resultCallback.onError(e.getCause());
             }
             return null;
+        } catch (Exception e) {
+            if (resultCallback != null) {
+                resultCallback.onError(e);
+            }
+            return null;
         }
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@ public Void call() throws Exception {`
`48`	`48`	`resultCallback.onError(e.getCause());`
`49`	`49`	`}`
`50`	`50`	`return null;`
	`51`	`+ } catch (Exception e) {`
	`52`	`+ if (resultCallback != null) {`
	`53`	`+ resultCallback.onError(e);`
	`54`	`+ }`
	`55`	`+ return null;`
`51`	`56`	`}`
`52`	`57`
`53`	`58`	`try {`