Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.cpp @ 6150:1e76463170b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7110720: Issue with vm config file loadingIssue with vm config file loading Summary: disabling default config files if -XX:-ReadDefaultConfigFiles Reviewed-by: phh, jrose, dcubed, dholmes
author kamg
date Thu, 29 Mar 2012 18:55:32 -0400
parents 31a5b9aad4bc
children 958bb4b7be49
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Fri Jan 20 16:56:31 2012 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Thu Mar 29 18:55:32 2012 -0400
@@ -3002,12 +3002,14 @@
     }
   }
 
+#ifdef ASSERT
   // Parse default .hotspotrc settings file
   if (!settings_file_specified) {
     if (!process_settings_file(".hotspotrc", false, args->ignoreUnrecognized)) {
       return JNI_EINVAL;
     }
   }
+#endif
 
   if (PrintVMOptions) {
     for (index = 0; index < args->nOptions; index++) {