🐛 Fix #35

puniverse · Feb 14, 2015 · b031936 · b031936
1 parent ec77715
commit b031936
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/clojure/co/paralleluniverse/pulsar/core.clj b/src/main/clojure/co/paralleluniverse/pulsar/core.clj
@@ -506,8 +506,9 @@
        clojure.lang.IFn
        (invoke
         [this x]
-        (.set dv x)
-        this))))
+        (if (.isDone dv)
+          nil
+          (do (.set dv x) this))))))
   ([]
    (promise nil)))
 

diff --git a/src/test/clojure/co/paralleluniverse/pulsar/core_test.clj b/src/test/clojure/co/paralleluniverse/pulsar/core_test.clj
@@ -133,10 +133,11 @@
         (join fiber)) => [0 1 2 3 4])
 
 (facts "promises-promises"
-       (fact "When try to set promise twice, then throw exception"
-             (let [v (promise)]
-               (deliver v "hi!")
-               (deliver v "bye!")) => throws IllegalStateException)
+       (let [v (promise)]
+         (fact "When try to set promise twice, then return nil and the first value wins"
+               [(deliver v "hi!")
+                (deliver v "bye!")
+                (deref v)] => [v nil "hi!"]))
        (fact "This complex promises test passes"
              (let [v1 (promise)
                    v2 (promise)