Browse Source

domain: fix off-by-one in Domain.exit()

We want to clear the found domain and the domains after it.

Signed-off-by: Trevor Norris <trev.norris@gmail.com>
v0.11.11-release
Ryan Graham 11 years ago
committed by Trevor Norris
parent
commit
5106cadffb
  1. 2
      lib/domain.js
  2. 59
      test/simple/test-domain-enter-exit.js

2
lib/domain.js

@ -141,7 +141,7 @@ Domain.prototype.exit = function() {
// exit all domains until this one. // exit all domains until this one.
var index = stack.lastIndexOf(this); var index = stack.lastIndexOf(this);
if (index !== -1) if (index !== -1)
stack.splice(index + 1); stack.splice(index);
else else
stack.length = 0; stack.length = 0;
_domain_flag[0] = stack.length; _domain_flag[0] = stack.length;

59
test/simple/test-domain-enter-exit.js

@ -0,0 +1,59 @@
// 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.
// Make sure the domain stack is a stack
var assert = require('assert');
var domain = require('domain');
function names(array) {
return array.map(function(d) {
return d.name
}).join(', ');
}
var a = domain.create();
a.name = 'a';
var b = domain.create();
b.name = 'b';
var c = domain.create();
c.name = 'c';
a.enter(); // push
assert.deepEqual(domain._stack, [a],
'a not pushed: ' + names(domain._stack));
b.enter(); // push
assert.deepEqual(domain._stack, [a, b],
'b not pushed: ' + names(domain._stack));
c.enter(); // push
assert.deepEqual(domain._stack, [a, b, c],
'c not pushed: ' + names(domain._stack));
b.exit(); // pop
assert.deepEqual(domain._stack, [a],
'b and c not popped: ' + names(domain._stack));
b.enter(); // push
assert.deepEqual(domain._stack, [a, b],
'b not pushed: ' + names(domain._stack));
Loading…
Cancel
Save