# HG changeset patch
# User minqi
# Date 1348542259 25200
# Node ID 3d739d45d9fd2a78fca2cfa1a80628a425d6587f
# Parent  b711844284e29b27dd22cc2a211d9f651ab7dc55# Parent  5a98bf7d847b56bf493f3ee5aaafae33fd43149f
Merge

diff -r 5a98bf7d847b -r 3d739d45d9fd src/share/vm/services/memTracker.cpp
--- a/src/share/vm/services/memTracker.cpp	Mon Sep 24 12:44:00 2012 -0700
+++ b/src/share/vm/services/memTracker.cpp	Mon Sep 24 20:04:19 2012 -0700
@@ -71,8 +71,13 @@
   _tracking_level = NMT_off;
   if (strncmp(option_line, "=summary", 8) == 0) {
     _tracking_level = NMT_summary;
-  } else if (strncmp(option_line, "=detail", 8) == 0) {
+  } else if (strncmp(option_line, "=detail", 7) == 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);
   }
 }