1.1 --- a/src/share/vm/runtime/arguments.cpp Wed Feb 15 12:32:03 2012 -0800
1.2 +++ b/src/share/vm/runtime/arguments.cpp Wed Feb 15 16:29:40 2012 -0800
1.3 @@ -102,8 +102,6 @@
1.4 char* Arguments::_meta_index_path = NULL;
1.5 char* Arguments::_meta_index_dir = NULL;
1.6
1.7 -static bool force_client_mode = false;
1.8 -
1.9 // Check if head of 'option' matches 'name', and sets 'tail' remaining part of option string
1.10
1.11 static bool match_option(const JavaVMOption *option, const char* name,
1.12 @@ -1345,7 +1343,7 @@
1.13 return;
1.14 }
1.15
1.16 - if (os::is_server_class_machine() && !force_client_mode ) {
1.17 + if (os::is_server_class_machine()) {
1.18 // If no other collector is requested explicitly,
1.19 // let the VM select the collector based on
1.20 // machine class and automatic selection policy.
1.21 @@ -2940,11 +2938,6 @@
1.22 // Construct the path to the archive
1.23 char jvm_path[JVM_MAXPATHLEN];
1.24 os::jvm_path(jvm_path, sizeof(jvm_path));
1.25 -#ifdef TIERED
1.26 - if (strstr(jvm_path, "client") != NULL) {
1.27 - force_client_mode = true;
1.28 - }
1.29 -#endif // TIERED
1.30 char *end = strrchr(jvm_path, *os::file_separator());
1.31 if (end != NULL) *end = '\0';
1.32 char *shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(jvm_path) +
