Skip to content

Commit db868ca

Browse files
committed
guard against self.socket being null
1 parent e1da561 commit db868ca

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

lib/client/websocket-tracker.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,12 @@ WebSocketTracker.prototype.destroy = function (cb) {
9595
clearInterval(self.interval)
9696
clearTimeout(self.reconnectTimer)
9797

98-
self.socket.removeListener('connect', self._onSocketConnectBound)
99-
self.socket.removeListener('data', self._onSocketDataBound)
100-
self.socket.removeListener('close', self._onSocketCloseBound)
101-
self.socket.removeListener('error', self._onSocketErrorBound)
98+
if (self.socket) {
99+
self.socket.removeListener('connect', self._onSocketConnectBound)
100+
self.socket.removeListener('data', self._onSocketDataBound)
101+
self.socket.removeListener('close', self._onSocketCloseBound)
102+
self.socket.removeListener('error', self._onSocketErrorBound)
103+
}
102104

103105
self._onSocketConnectBound = null
104106
self._onSocketErrorBound = null
@@ -120,9 +122,8 @@ WebSocketTracker.prototype.destroy = function (cb) {
120122
if (socketPool[self.announceUrl].consumers === 0) {
121123
delete socketPool[self.announceUrl]
122124

123-
self.socket.on('error', noop) // ignore all future errors
124-
125125
try {
126+
self.socket.on('error', noop) // ignore all future errors
126127
self.socket.destroy(cb)
127128
} catch (err) {
128129
cb(null)

0 commit comments

Comments
 (0)