fix #29

yortus · Jan 5, 2016 · 250cba2 · 250cba2
1 parent f20e964
commit 250cba2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/await/makeAwaitFunc.js b/src/await/makeAwaitFunc.js
diff --git a/src/await/makeAwaitFunc.ts b/src/await/makeAwaitFunc.ts
@@ -45,7 +45,10 @@ function getExtraInfo(traverse: (o, visitor: Function) => void, topN?: number) {
         if (expr && _.isFunction(expr.then)) {
 
             // A promise: resume the coroutine with the resolved value, or throw the rejection value into it.
-            expr.then(val => { fiber.run(val); fiber = null; }, err => { fiber.throwInto(err); fiber = null; });
+            // NB: ensure the handlers return null to avoid bluebird 3.x warning 'a promise was created in a
+            //     handler but none were returned from it'. This occurs if the next resumption of the suspendable
+            //     function (i.e. in the client's code) creates a bluebird 3.x promise and then awaits it.
+            expr.then(val => (fiber.run(val), fiber = null), err => (fiber.throwInto(err), fiber = null));
         }
         else if (_.isFunction(expr)) {