[fixup] restore iff retrieve

nodejs · Jul 16, 2017 · 605de08 · 605de08
1 parent 8414756
commit 605de08
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -33,12 +33,14 @@ function triggerAsyncId() {
 
 
 function triggerIdScopeSync(id, block) {
-  const old = async_uid_fields[kCurrentTriggerId];
+  let old = async_uid_fields[kCurrentTriggerId];
   async_uid_fields[kCurrentTriggerId] = id;
   try {
-    return block();
+    const ret = block();
+    if (async_uid_fields[kCurrentTriggerId] !== id) old = null;
+    return ret;
   } finally {
-    async_uid_fields[kCurrentTriggerId] = old;
+    old && (async_uid_fields[kCurrentTriggerId] = old);
   }
 }