Fixed .off() race condition

nodeca · Jul 12, 2016 · d8d081a · d8d081a
1 parent 2ecfce2
commit d8d081a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/index.js b/index.js
@@ -219,6 +219,9 @@ Wire.prototype.__emitOne = function (ch, params) {
     var fn = wh.func;
     var p = self.__p.resolve();
 
+    // Check if handler removed
+    if (!fn) return;
+
     if (wh.once) { self.off(wh.channel, fn); }
 
     if (wh.gen) {

diff --git a/test/test.js b/test/test.js
@@ -471,6 +471,24 @@ describe('Wire', function () {
   });
 
 
+  it('async + `.off()` race condition', function (done) {
+    var w = ew();
+
+    function h2() {
+    }
+
+    function h1(callback) {
+      w.off('test', h2);
+      setTimeout(callback, 1);
+    }
+
+    w.on('test', h1);
+    w.on('test', h2);
+
+    w.emit('test', done);
+  });
+
+
   describe('errors', function () {
 
     it('bad priority', function () {