Fix cleanup issue in ChakraCore xplat

PR-URL: #147 Reviewed-By: Kunal Pathak <[email protected]> Reviewed-By: Mark Marron <[email protected]>
nodejs · Nov 26, 2016 · cc9c687 · cc9c687
1 parent 638947d
commit cc9c687
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/deps/chakrashim/core/lib/Jsrt/JsrtHelper.cpp b/deps/chakrashim/core/lib/Jsrt/JsrtHelper.cpp
@@ -110,9 +110,8 @@ void JsrtCallbackState::ObjectBeforeCallectCallbackWrapper(JsObjectBeforeCollect
     // setup the cleanup
     // we do not track the main thread. When it exits do the cleanup below
     atexit([]() {
-        ThreadBoundThreadContextManager::DestroyContextAndEntryForCurrentThread();
-
         JsrtRuntime::Uninitialize();
+        ThreadBoundThreadContextManager::DestroyContextAndEntryForCurrentThread();
 
         // thread-bound entrypoint should be able to get cleanup correctly, however tlsentry
         // for current thread might be left behind if this thread was initialized.