src/jdk.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp

@@ -219,11 +219,11 @@
     }
 
     return result;
 }
 
-TString WindowsPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) {
+TString WindowsPlatform::GetBundledJavaLibraryFileName(TString RuntimePath) {
     TString result = FilePath::IncludeTrailingSeparator(RuntimePath) +
             _T("jre\\bin\\jli.dll");
 
     if (FilePath::FileExists(result) == false) {
         result = FilePath::IncludeTrailingSeparator(RuntimePath) +

@@ -237,15 +237,11 @@
     IniFile *result = new IniFile();
     if (result == NULL) {
         return NULL;
     }
 
-    if (result->LoadFromFile(FileName) == false) {
-        // New property file format was not found,
-        // attempt to load old property file format.
-        Helpers::LoadOldConfigFile(FileName, result);
-    }
+    result->LoadFromFile(FileName);
 
     return result;
 }
 
 TString WindowsPlatform::GetModuleFileName() {