Merge
authorzgu
Wed, 20 Aug 2014 21:37:50 +0000
changeset 26291 158000a480bc
parent 26290 ac1c808c4ab6 (diff)
parent 26289 6c45e10fd30d (current diff)
child 26294 ff1a31478531
Merge
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Wed Aug 20 08:50:10 2014 -0400
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Wed Aug 20 21:37:50 2014 +0000
@@ -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;