1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug Fix: Late promise promise callbacks firing

Browse Source 
Late promise bindings would fire regardless of the outcome of the
promise.

Test case by: Jonas "zimbatm" Pfenniger <jonas@pfenniger.name>
This commit is contained in:
Felix Geisendörfer 2010-01-24 23:10:25 +01:00 committed by Ryan Dahl
parent c99e33bc90
commit c86c614cac
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/node.js
View File

@ -233,7 +233,7 @@ var eventsModule = createInternalModule('events', function (exports) {
exports.Promise.prototype.emitSuccess = function() {
if (this.hasFired) return;
this.hasFired = true;
this.hasFired = 'success';
this._clearTimeout();
this._values = Array.prototype.slice.call(arguments);
@ -242,7 +242,7 @@ var eventsModule = createInternalModule('events', function (exports) {
exports.Promise.prototype.emitError = function() {
if (this.hasFired) return;
this.hasFired = true;
this.hasFired = 'error';
this._clearTimeout();
this._values = Array.prototype.slice.call(arguments);
@ -261,7 +261,7 @@ var eventsModule = createInternalModule('events', function (exports) {
};
exports.Promise.prototype.addCallback = function (listener) {
if (this.hasFired) {
if (this.hasFired === 'success') {
return listener.apply(this, this._values);
}
@ -269,7 +269,7 @@ var eventsModule = createInternalModule('events', function (exports) {
};
exports.Promise.prototype.addErrback = function (listener) {
if (this.hasFired) {
if (this.hasFired === 'error') {
listener.apply(this, this._values);
}

6
test/mjsunit/test-promise.js
View File

@ -19,12 +19,18 @@ a.addCallback(function(value) {
assert.equal(TEST_VALUE, value);
expectedCallbacks.a1--;
});
a.addErrback(function(error) {
assert.notEqual(TEST_VALUE, error, 'normal');
});
a.emitSuccess(TEST_VALUE);
a.addCallback(function(value) {
assert.equal(TEST_VALUE, value);
expectedCallbacks.a2--;
});
a.addErrback(function(error) {
assert.notEqual(TEST_VALUE, error, 'late');
});
// Test regular & late errback binding
var b = new Promise();