diff -r 47c2aca6c306 -r f2d429260ad4 src/jdk.jpackage/share/native/libapplauncher/Package.cpp --- a/src/jdk.jpackage/share/native/libapplauncher/Package.cpp Thu Mar 28 08:08:07 2019 -0700 +++ b/src/jdk.jpackage/share/native/libapplauncher/Package.cpp Thu Mar 28 13:47:40 2019 -0400 @@ -192,8 +192,8 @@ // -> cdsUninitialized // -> cdsGenCache If -Xappcds:generatecache // -> cdsDisabled If -Xappcds:off -// -> cdsEnabled If "AppCDSJVMOptions" section is present -// -> cdsAuto If "AppCDSJVMOptions" section is present and +// -> cdsEnabled If "AppCDSJavaOptions" section is present +// -> cdsAuto If "AppCDSJavaOptions" section is present and // app.appcds.cache=auto // -> cdsDisabled Default // @@ -213,7 +213,7 @@ case cdsUninitialized: { if (Config->ContainsSection( - keys[CONFIG_SECTION_APPCDSJVMOPTIONS]) == true) { + keys[CONFIG_SECTION_APPCDSJAVAOPTIONS]) == true) { // If the AppCDS section is present then enable AppCDS. TString appCDSCacheValue; @@ -248,21 +248,21 @@ } case cdsDisabled: { - Config->GetSection(keys[CONFIG_SECTION_JVMOPTIONS], + Config->GetSection(keys[CONFIG_SECTION_JAVAOPTIONS], FBootFields->FJVMArgs); break; } case cdsGenCache: { Config->GetSection(keys[ - CONFIG_SECTION_APPCDSGENERATECACHEJVMOPTIONS], + CONFIG_SECTION_APPCDSGENERATECACHEJAVAOPTIONS], FBootFields->FJVMArgs); break; } case cdsAuto: case cdsEnabled: { - if (Config->GetValue(keys[CONFIG_SECTION_APPCDSJVMOPTIONS], + if (Config->GetValue(keys[CONFIG_SECTION_APPCDSJAVAOPTIONS], _T( "-XX:SharedArchiveFile"), FBootFields->FAppCDSCacheFileName) == true) { // File names may contain the incorrect path separators. @@ -275,13 +275,13 @@ FilePath::FixPathForPlatform( FBootFields->FAppCDSCacheFileName); iniConfig->SetValue(keys[ - CONFIG_SECTION_APPCDSJVMOPTIONS], + CONFIG_SECTION_APPCDSJAVAOPTIONS], _T( "-XX:SharedArchiveFile"), FBootFields->FAppCDSCacheFileName); } } - Config->GetSection(keys[CONFIG_SECTION_APPCDSJVMOPTIONS], + Config->GetSection(keys[CONFIG_SECTION_APPCDSJAVAOPTIONS], FBootFields->FJVMArgs); }