# HG changeset patch
# User zgu
# Date 1354113723 28800
# Node ID 5de2a5bd519ede7ffb6596243c8b4c7287b779a7
# Parent  bbc14465e7db05c775097212b85bf0ba9312b5ea# Parent  7c15faa95ce72afa40b6a3008e180552ee2a1d43
Merge

diff -r 7c15faa95ce7 -r 5de2a5bd519e src/share/vm/services/memTracker.cpp
--- a/src/share/vm/services/memTracker.cpp	Tue Nov 27 07:57:57 2012 -0800
+++ b/src/share/vm/services/memTracker.cpp	Wed Nov 28 06:42:03 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);
   }
 }