diff -r 4f1efc26b577 -r 2891b3ae222d src/jdk.jpackage/share/native/libapplauncher/Helpers.cpp --- a/src/jdk.jpackage/share/native/libapplauncher/Helpers.cpp Tue Apr 09 11:30:09 2019 -0400 +++ b/src/jdk.jpackage/share/native/libapplauncher/Helpers.cpp Tue Apr 09 16:06:21 2019 -0400 @@ -125,7 +125,7 @@ } OrderedMap - Helpers::GetJVMArgsFromConfig(IPropertyContainer* config) { + Helpers::GetJavaOptionsFromConfig(IPropertyContainer* config) { OrderedMap result; for (unsigned int index = 0; index < config->GetCount(); index++) { @@ -192,16 +192,16 @@ AppendToIni(propertyFile, Container, keys[CONFIG_CLASSPATH_KEY]); AppendToIni(propertyFile, Container, keys[APP_NAME_KEY]); AppendToIni(propertyFile, Container, keys[CONFIG_APP_ID_KEY]); - AppendToIni(propertyFile, Container, keys[JVM_RUNTIME_KEY]); + AppendToIni(propertyFile, Container, keys[JAVA_RUNTIME_KEY]); AppendToIni(propertyFile, Container, keys[JPACKAGE_APP_DATA_DIR]); AppendToIni(propertyFile, Container, keys[CONFIG_APP_MEMORY]); AppendToIni(propertyFile, Container, keys[CONFIG_SPLASH_KEY]); // JavaOptions Section - OrderedMap JVMArgs = - Helpers::GetJVMArgsFromConfig(&propertyFile); - Container->AppendSection(keys[CONFIG_SECTION_JAVAOPTIONS], JVMArgs); + OrderedMap JavaOptions = + Helpers::GetJavaOptionsFromConfig(&propertyFile); + Container->AppendSection(keys[CONFIG_SECTION_JAVAOPTIONS], JavaOptions); // ArgOptions Section std::list args = Helpers::GetArgsFromConfig(&propertyFile);