avoid race to set ws.onclose callback

between stop_channels and ws_closed_late
jupyter · Jan 13, 2017 · f587b01 · f587b01
1 parent 3fb26ad
commit f587b01
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/notebook/static/services/kernels/kernel.js b/notebook/static/services/kernels/kernel.js
@@ -30,6 +30,7 @@ define([
         this.id = null;
         this.name = name;
         this.ws = null;
+        this._stopping = false;
 
         this.kernel_service_url = kernel_service_url;
         this.kernel_url = null;
@@ -507,7 +508,7 @@ define([
         this.ws.onerror = ws_error;
         // switch from early-close to late-close message after 1s
         setTimeout(function() {
-            if (that.ws !== null) {
+            if (that.ws !== null && !that._stopping) {
                 that.ws.onclose = ws_closed_late;
             }
         }, 1000);
@@ -578,11 +579,14 @@ define([
          */
         var that = this;
         var close = function () {
+            that._stopping = false;
             if (that.ws && that.ws.readyState === WebSocket.CLOSED) {
                 that.ws = null;
             }
         };
         if (this.ws !== null) {
+            // flag to avoid races with on_close_late
+            this._stopping = true;
             if (this.ws.readyState === WebSocket.OPEN) {
                 this.ws.onclose = close;
                 this.ws.close();