Merge pull request kriskowal#499 from kriskowal/kriskowalgh-497

Ensure that Q.asap functions always return promise
qiutiaoming · Apr 7, 2014 · cdb9dc9 · cdb9dc9
2 parents 5dc1657 + 30bb02d
commit cdb9dc9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/q.js b/q.js
@@ -1193,7 +1193,7 @@ function async(makeGenerator) {
                     return reject(exception);
                 }
                 if (result.done) {
-                    return result.value;
+                    return Q(result.value);
                 } else {
                     return when(result.value, callback, errback);
                 }
@@ -1204,7 +1204,7 @@ function async(makeGenerator) {
                     result = generator[verb](arg);
                 } catch (exception) {
                     if (isStopIteration(exception)) {
-                        return exception.value;
+                        return Q(exception.value);
                     } else {
                         return reject(exception);
                     }