Fixed; only clear handlers if they were set. [level09]

yyankovblc · Jun 30, 2011 · 40c1f8d · 40c1f8d
1 parent 9b40977
commit 40c1f8d
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lib/transport.js b/lib/transport.js
@@ -115,6 +115,8 @@ Transport.prototype.setHandlers = function () {
   this.socket.on('close', this.bound.close);
   this.socket.on('error', this.bound.error);
   this.socket.on('drain', this.bound.drain);
+
+  this.handlersSet = true;
 };
 
 /**
@@ -124,14 +126,16 @@ Transport.prototype.setHandlers = function () {
  */
 
 Transport.prototype.clearHandlers = function () {
-  this.store.unsubscribe('disconnect-force:' + this.id);
-  this.store.unsubscribe('heartbeat-clear:' + this.id);
-  this.store.unsubscribe('dispatch:' + this.id);
-
-  this.socket.removeListener('end', this.bound.end);
-  this.socket.removeListener('close', this.bound.close);
-  this.socket.removeListener('error', this.bound.error);
-  this.socket.removeListener('drain', this.bound.drain);
+  if (this.handlersSet) {
+    this.store.unsubscribe('disconnect-force:' + this.id);
+    this.store.unsubscribe('heartbeat-clear:' + this.id);
+    this.store.unsubscribe('dispatch:' + this.id);
+
+    this.socket.removeListener('end', this.bound.end);
+    this.socket.removeListener('close', this.bound.close);
+    this.socket.removeListener('error', this.bound.error);
+    this.socket.removeListener('drain', this.bound.drain);
+  }
 };
 
 /**