src/jdk.jpackage/share/native/libapplauncher/Package.cpp

@@ -190,12 +190,12 @@
 // The state of AppCDS is as follows:
 //
 // -> 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
 //
 void Package::PromoteAppCDSState(ISectionalPropertyContainer* Config) {
     Platform& platform = Platform::GetInstance();

@@ -211,11 +211,11 @@
             break;
         }
 
         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;
 
                 // If running with AppCDS enabled, and the configuration has
                 // been setup so "auto" is enabled, then

@@ -246,25 +246,25 @@
         case cdsUninitialized: {
             throw Exception(_T("Internal Error"));
         }
 
         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.
                 // The cache file name must be corrected at this point.
                 if (FBootFields->FAppCDSCacheFileName.empty() == false) {

@@ -273,17 +273,17 @@
                     if (iniConfig != NULL) {
                         FBootFields->FAppCDSCacheFileName =
                                 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);
             }
 
             break;
         }