fix(contextwrap): remove window and context while ContextWrap.destory

Tencent · Jul 23, 2018 · 36bbfe8 · 36bbfe8
1 parent ce7ff70
commit 36bbfe8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/bin/proxy/http.route.js b/bin/proxy/http.route.js
@@ -82,13 +82,13 @@ module.exports = function(req, res) {
                 d.remove(res);
 
                 if (d.currentContext) {
-                    d.currentContext.window.request = null;
-                    d.currentContext.window.response = null;
-                    d.currentContext.window.onerror = null;
-                    d.currentContext.window = null;
-                }
+                    if (d.currentContext.window) {
+                        d.currentContext.window.request = null;
+                        d.currentContext.window.response = null;
+                        d.currentContext.window.onerror = null;
+                        d.currentContext.window = null;
+                    }
 
-                if (d.currentContext) {
                     d.currentContext.log = null;
                     d.currentContext = null;
                 }

diff --git a/bin/tsw/runtime/ContextWrap.js b/bin/tsw/runtime/ContextWrap.js
@@ -66,8 +66,23 @@ class ContextWrap extends EventEmitter {
     }
 
     destroy() {
-        this._domain.remove(this._req);
-        this._domain.remove(this._rsp);
+
+        const d = this._domain;
+
+        d.remove(this._req);
+        d.remove(this._rsp);
+
+        if (d.currentContext) {
+            if (d.currentContext.window) {
+                d.currentContext.window.request = null;
+                d.currentContext.window.response = null;
+                d.currentContext.window.onerror = null;
+                d.currentContext.window = null;
+            }
+
+            d.currentContext.log = null;
+            d.currentContext = null;
+        }
 
         this._domain = null;
         this._req = null;