changeset 26290:ac1c808c4ab6

8055236: Deadlock during NMT2 shutdown on Windows Summary: Removed MemTracker::shutdown() call to avoid deadlock Reviewed-by: minqi, ctornqvi
author zgu
date Wed, 20 Aug 2014 15:58:45 -0400
parents bb90f572f1a6
children 158000a480bc
files hotspot/src/os/windows/vm/os_windows.cpp
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Fri Aug 15 20:37:43 2014 +0000
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Wed Aug 20 15:58:45 2014 -0400
@@ -135,11 +135,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;