# HG changeset patch
# User zgu
# Date 1408036523 14400
# Node ID f5164941749c99843917a8be7bb4c82b9b75931e
# Parent  017b0145f20ce2010f6e1962eeef0b39777e032a
8054547: Re-enable warning for incompatible java launcher
Summary: Re-enabled warning as launcher change reached promotion build
Reviewed-by: hseigel, coleenp

diff -r 017b0145f20c -r f5164941749c src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Aug 12 14:06:41 2014 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Thu Aug 14 13:15:23 2014 -0400
@@ -3601,9 +3601,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()) {