clear websocket attribute without waiting for previous websocket to f…

…inish closing which may never finish
jupyter · Jan 13, 2017 · 255ae89 · 255ae89
1 parent 3fb26ad
commit 255ae89
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/notebook/static/services/kernels/kernel.js b/notebook/static/services/kernels/kernel.js
@@ -576,18 +576,13 @@ define([
          *
          * @function stop_channels
          */
-        var that = this;
-        var close = function () {
-            if (that.ws && that.ws.readyState === WebSocket.CLOSED) {
-                that.ws = null;
-            }
-        };
         if (this.ws !== null) {
-            if (this.ws.readyState === WebSocket.OPEN) {
-                this.ws.onclose = close;
-                this.ws.close();
-            } else {
-                close();
+            var ws = this.ws;
+            this.ws = null;
+            if (ws.readyState === WebSocket.OPEN) {
+                // unregister onclose callbacks
+                ws.onclose = function () {};
+                ws.close();
             }
         }
     };