# HG changeset patch
# User zgu
# Date 1409143378 14400
# Node ID aef17e6b4abf9d74d3f4306af3d3dae58f05bdc6
# Parent  dd3939fe8424577ff3b04bf16365f2609829fb8e
8055236: Deadlock during NMT2 shutdown on Windows
Summary: Removed MemTracker::shutdown() call to avoid deadlock
Reviewed-by: minqi, ctornqvi

diff -r dd3939fe8424 -r aef17e6b4abf src/os/windows/vm/os_windows.cpp
--- a/src/os/windows/vm/os_windows.cpp	Wed Aug 20 08:41:15 2014 -0400
+++ b/src/os/windows/vm/os_windows.cpp	Wed Aug 27 08:42:58 2014 -0400
@@ -132,11 +132,6 @@
       if(ForceTimeHighResolution)
         timeEndPeriod(1L);
 
-       // Workaround for issue when a custom launcher doesn't call
-       // DestroyJavaVM and NMT is trying to track memory when free is
-       // called from a static destructor
-       MemTracker::shutdown();
-
       break;
     default:
       break;