Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8054547: Re-enable warning for incompatible java launcher
authorzgu
Thu, 14 Aug 2014 13:15:23 -0400
changeset 26138 d0be5ee90363
parent 25956 99be217ac88d
child 26139 8dc6add1488f
8054547: Re-enable warning for incompatible java launcher Summary: Re-enabled warning as launcher change reached promotion build Reviewed-by: hseigel, coleenp
hotspot/src/share/vm/runtime/arguments.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Aug 12 21:16:05 2014 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Thu Aug 14 13:15:23 2014 -0400
@@ -3596,9 +3596,9 @@
 #if INCLUDE_NMT
     if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
       // The launcher did not setup nmt environment variable properly.
-//      if (!MemTracker::check_launcher_nmt_support(tail)) {
-//        warning("Native Memory Tracking did not setup properly, using wrong launcher?");
-//      }
+      if (!MemTracker::check_launcher_nmt_support(tail)) {
+        warning("Native Memory Tracking did not setup properly, using wrong launcher?");
+      }
 
       // Verify if nmt option is valid.
       if (MemTracker::verify_nmt_option()) {
jdk-sandbox