# HG changeset patch
# User coleenp
# Date 1354121006 28800
# Node ID b51dc8df86e54881a9887187352e47559206a6ae
# Parent  5de2a5bd519ede7ffb6596243c8b4c7287b779a7# Parent  fe81517cfb779a1c8a70a0ee9e6c5b4f972e1950
Merge

diff -r fe81517cfb77 -r b51dc8df86e5 src/share/vm/services/memTracker.cpp
--- a/src/share/vm/services/memTracker.cpp	Wed Nov 28 08:17:59 2012 -0500
+++ b/src/share/vm/services/memTracker.cpp	Wed Nov 28 08:43:26 2012 -0800
@@ -69,15 +69,12 @@
 
 void MemTracker::init_tracking_options(const char* option_line) {
   _tracking_level = NMT_off;
-  if (strncmp(option_line, "=summary", 8) == 0) {
+  if (strcmp(option_line, "=summary") == 0) {
     _tracking_level = NMT_summary;
-  } else if (strncmp(option_line, "=detail", 7) == 0) {
+  } else if (strcmp(option_line, "=detail") == 0) {
     _tracking_level = NMT_detail;
-  } else {
-    char msg[255];
-    //+1 to remove the '=' character
-    jio_snprintf(msg, 255, "Unknown option given to XX:NativeMemoryTracking: %s", option_line+1);
-    vm_exit_during_initialization(msg, NULL);
+  } else if (strcmp(option_line, "=off") != 0) {
+    vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
   }
 }