hotspot/src/share/vm/runtime/java.cpp
changeset 15191 d5f9601f72af
parent 14583 d70ee55535f4
child 15202 9304f658b07e
--- a/hotspot/src/share/vm/runtime/java.cpp	Tue Jan 08 15:47:23 2013 -0800
+++ b/hotspot/src/share/vm/runtime/java.cpp	Fri Jan 11 12:30:54 2013 -0500
@@ -542,6 +542,10 @@
     BeforeExit_lock->notify_all();
   }
 
+  // Shutdown NMT before exit. Otherwise,
+  // it will run into trouble when system destroys static variables.
+  MemTracker::shutdown(MemTracker::NMT_normal);
+
   #undef BEFORE_EXIT_NOT_RUN
   #undef BEFORE_EXIT_RUNNING
   #undef BEFORE_EXIT_DONE