From: Trevor Norris Date: Tue, 21 Jan 2014 23:28:23 +0000 (-0800) Subject: node: only run same AL once on error X-Git-Tag: v0.11.11~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f32c1ffe56590ba7f8d3dc31d8ab1f1fec446d1c;p=platform%2Fupstream%2Fnodejs.git node: only run same AL once on error Should have been included with 60fcc11 as it is the same type of fix. Signed-off-by: Forrest L Norvell --- diff --git a/src/node.js b/src/node.js index 31c0e1b..feea2d1 100644 --- a/src/node.js +++ b/src/node.js @@ -475,7 +475,8 @@ if (asyncQueue) { for (i = 0; i < asyncQueue.length; i++) { queueItem = asyncQueue[i]; - if ((queueItem.flags & HAS_ERROR_AL) === 0) + if ((queueItem.flags & HAS_ERROR_AL) === 0 || + (data && data[queueItem.uid] !== undefined)) continue; try { threw = true; diff --git a/test/simple/test-asynclistener-run-error-once.js b/test/simple/test-asynclistener-run-error-once.js new file mode 100644 index 0000000..9a090aa --- /dev/null +++ b/test/simple/test-asynclistener-run-error-once.js @@ -0,0 +1,55 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); +var net = require('net'); + +var cntr = 0; +var al = process.addAsyncListener({ + error: function(stor, er) { + cntr++; + process._rawDebug('Handling error: ' + er.message); + return true; + } +}); + +process.on('exit', function(status) { + process.removeAsyncListener(al); + + assert.equal(status, 0); + assert.equal(cntr, 1); + console.log('ok'); +}); + + +var server = net.createServer(function(c) { + throw new Error('net - error: server connection'); +}); + + +server.listen(common.PORT, function() { + net.connect(common.PORT, function() { + setImmediate(function() { + process.exit(); + }); + }); +});