modules/jdk.packager/src/main/native/library/common/Package.cpp

@@ -122,15 +122,10 @@
 
     // Runtime.
     FBootFields->FIsRuntimeBundled = true;
     config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[JVM_RUNTIME_KEY], FBootFields->FJVMRuntimeDirectory);
 
-    if (FBootFields->FJVMRuntimeDirectory.empty()) {
-        FBootFields->FIsRuntimeBundled = false;
-        FBootFields->FJVMRuntimeDirectory = platform.GetSystemJRE();
-    }
-
     // Read jvmargs.
     PromoteAppCDSState(config);
     ReadJVMArgs(config);
 
     // Read args if none were passed in.

@@ -608,13 +603,10 @@
         if (IsRuntimeBundled() == true) {
             Macros& macros = Macros::GetInstance();
             TString jvmRuntimePath = macros.ExpandMacros(GetJVMRuntimeDirectory());
             FBootFields->FJVMLibraryFileName = platform.GetBundledJVMLibraryFileName(jvmRuntimePath);
         }
-        else {
-            FBootFields->FJVMLibraryFileName = platform.GetSystemJVMLibraryFileName();
-        }
     }
 
     return FBootFields->FJVMLibraryFileName;
 }