Fail promise with the same exception as canceled future

stuartsierra · Nov 30, 2012 · 9ec014a · 9ec014a
1 parent 068aace
commit 9ec014a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/cljque/promises.clj b/src/cljque/promises.clj
@@ -269,7 +269,9 @@
          (isDone [_] (.isDone fut))
          (cancel [_ interrupt?]
            (let [b (.cancel fut interrupt?)]
-             (when b (fail return (CancellationException.)))
+             (when b (fail return (try (.get fut)
+                                       (CancellationException.)
+                                       (catch Throwable t t))))
              b))
          INotify
          (-attend [_ f executor]