Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 6150:1e76463170b3
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 |
comparison
equal
deleted
inserted
replaced
| 4813:e850d8e7ea54 | 6150:1e76463170b3 |
|---|---|
| 3000 if (!process_settings_file(flags_file, true, args->ignoreUnrecognized)) { | 3000 if (!process_settings_file(flags_file, true, args->ignoreUnrecognized)) { |
| 3001 return JNI_EINVAL; | 3001 return JNI_EINVAL; |
| 3002 } | 3002 } |
| 3003 } | 3003 } |
| 3004 | 3004 |
| 3005 #ifdef ASSERT | |
| 3005 // Parse default .hotspotrc settings file | 3006 // Parse default .hotspotrc settings file |
| 3006 if (!settings_file_specified) { | 3007 if (!settings_file_specified) { |
| 3007 if (!process_settings_file(".hotspotrc", false, args->ignoreUnrecognized)) { | 3008 if (!process_settings_file(".hotspotrc", false, args->ignoreUnrecognized)) { |
| 3008 return JNI_EINVAL; | 3009 return JNI_EINVAL; |
| 3009 } | 3010 } |
| 3010 } | 3011 } |
| 3012 #endif | |
| 3011 | 3013 |
| 3012 if (PrintVMOptions) { | 3014 if (PrintVMOptions) { |
| 3013 for (index = 0; index < args->nOptions; index++) { | 3015 for (index = 0; index < args->nOptions; index++) { |
| 3014 const JavaVMOption *option = args->options + index; | 3016 const JavaVMOption *option = args->options + index; |
| 3015 if (match_option(option, "-XX:", &tail)) { | 3017 if (match_option(option, "-XX:", &tail)) { |