Fix missing rejection of next promise if callback returns a promise w…

…hich is rejected
henhal · Feb 17, 2016 · c7d6ea3 · c7d6ea3
1 parent 78e666a
commit c7d6ea3
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/jq/src/main/java/se/code77/jq/PromiseImpl.java b/jq/src/main/java/se/code77/jq/PromiseImpl.java
@@ -1,6 +1,8 @@
 
 package se.code77.jq;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -229,7 +231,7 @@ public boolean isDone() {
 
     @Override
     public String toString() {
-        return getLogPrefix() + mState.toString();
+        return getLogPrefix() + mState.toString() + (mTerminate ? ", TERMINATE" : "");
     }
 
     private void ensurePending() {
@@ -337,13 +339,23 @@ public Future onFulfilled(Object value) throws Exception {
                                 link.nextPromise._resolve(value);
                                 return null;
                             }
+                        }, new OnRejectedCallback() {
+                            @Override
+                            public Future onRejected(Exception reason) throws Exception {
+                                link.nextPromise._reject(reason);
+                                return null;
+                            }
                         }).done();
                     } else {
                         link.nextPromise._resolve(null);
                     }
                 } catch (UnhandledRejectionException e) {
                     throw e;
                 } catch (Exception reason) {
+                    StringWriter sw = new StringWriter();
+                    reason.printStackTrace(new PrintWriter(sw));
+                    debug("Promise rejected from callback: " + sw.toString());
+
                     link.nextPromise._reject(reason);
                 }
             }