fix(link-deatch): removeListener upon detach

noodlefrenzy · Jun 16, 2015 · 05f1413 · 05f1413
1 parent 7a81744
commit 05f1413
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/link.js b/lib/link.js
@@ -100,15 +100,14 @@ Link.prototype.attach = function() {
 Link.prototype.detach = function() {
   var self = this;
   var detachPromise = new Promise(function(resolve, reject) {
+    var onError = function(err) { reject(err); };
+    self.once(Link.ErrorReceived, onError);
     self.once(Link.Detached, function(info) {
+      self.removeListener(Link.ErrorReceived, onError);
       if (!!info.error) return reject(info.error);
       if (!info.closed) return reject('link not closed');
       resolve();
     });
-
-    self.once(Link.ErrorReceived, function(err) {
-      reject(err);
-    });
   });
 
   this.linkSM.sendDetach();

diff --git a/lib/session.js b/lib/session.js
@@ -262,7 +262,7 @@ Session.prototype.addWindow = function(windowSize, flowOptions) {
 };
 
 Session.prototype.detachLink = function(link) {
-  link.detach();
+  return link.detach();
 };
 
 Session.prototype.end = function() {