Skip to content

Commit

Permalink
Fix double-resolving for misbehaved promises (#75).
Browse files Browse the repository at this point in the history
See #76 for some discussion. The fix credit goes to @ForbesLindesay.
  • Loading branch information
domenic committed Jul 25, 2012
1 parent 1633b11 commit e21707b
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
15 changes: 11 additions & 4 deletions q.js
Original file line number Diff line number Diff line change
Expand Up @@ -887,20 +887,27 @@ function when(value, fulfilled, rejected) {

nextTick(function () {
resolve(value).promiseSend("when", function (value) {
if (done) {
return;
}
done = true;
resolve(value).promiseSend("when", function (value) {
if (done) {
return;
}
done = true;

deferred.resolve(_fulfilled(value));
}, function (exception) {
if (done) {
return;
}
done = true;

deferred.resolve(_rejected(exception));
});
}, function (exception) {
if (done) {
return;
}
done = true;

deferred.resolve(_rejected(exception));
});
});
Expand Down
17 changes: 17 additions & 0 deletions spec/q-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1110,5 +1110,22 @@ describe("possible regressions", function () {
});
});

describe("gh-75", function () {
it("does not double-resolve misbehaved promises", function () {
var badPromise = Q.makePromise({
post: function () { return "hello"; }
});

var resolutions = 0;
function onResolution() {
++resolutions;
}

return Q.when(badPromise, onResolution, onResolution).then(function () {
expect(resolutions).toBe(1);
});
});
});

});

0 comments on commit e21707b

Please sign in to comment.