Mercurial > hg > graal-compiler

diff src/share/vm/runtime/java.cpp @ 7596:212c5b9c38e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dlong
date Thu, 17 Jan 2013 01:27:02 -0500
parents 9deda4d8e126 e0cf9af8978e
children 3ac7d10a6572 db9981fd3124
line wrap: on
line diff
--- a/src/share/vm/runtime/java.cpp	Mon Jan 14 13:52:08 2013 -0500
+++ b/src/share/vm/runtime/java.cpp	Thu Jan 17 01:27:02 2013 -0500
@@ -548,6 +548,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