changeset 26294:ff1a31478531

Merge
author ctornqvi
date Thu, 21 Aug 2014 01:43:27 +0000
parents 5c7a054e59fe 158000a480bc
children 6a9d9192f215
files
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Wed Aug 20 14:59:33 2014 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Thu Aug 21 01:43:27 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;