From 181ebe98ef66d51ead56e9344d0b90cf9760639b Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Wed, 20 Aug 2014 15:58:45 -0400 Subject: [PATCH] 8055236: Deadlock during NMT2 shutdown on Windows Removed MemTracker::shutdown() call to avoid deadlock Reviewed-by: minqi, ctornqvi --- hotspot/src/os/windows/vm/os_windows.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp index 73055a88039..378c6450a5b 100644 --- a/hotspot/src/os/windows/vm/os_windows.cpp +++ b/hotspot/src/os/windows/vm/os_windows.cpp @@ -135,11 +135,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { 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;