jdk-sandbox: comparison src/jdk.packager/share/native/library/common/Package.cpp

equal deleted inserted replaced

-:eaca4369b068
+:e094d5483bd6
 Package::Package(void) {
 FInitialized = false;
 Initialize();
 }
-TPlatformNumber StringToPercentageOfNumber(TString Value, TPlatformNumber Number) {
+TPlatformNumber StringToPercentageOfNumber(TString Value,
+TPlatformNumber Number) {
 TPlatformNumber result = 0;
 size_t percentage = atoi(PlatformString(Value.c_str()));
 if (percentage > 0 && Number > 0) {
 result = Number * percentage / 100;
 // everything must be initialised at this point
 return false;
 }
 TString appName;
 TString appVersion;
-AutoFreePtr<ISectionalPropertyContainer> config = platform.GetConfigFile(platform.GetConfigFileName());
+AutoFreePtr<ISectionalPropertyContainer> config =
+platform.GetConfigFile(platform.GetConfigFileName());
 std::map<TString, TString> keys = platform.GetKeys();
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[APP_NAME_KEY], appName);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_VERSION], appVersion);
+keys[APP_NAME_KEY], appName);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[CONFIG_VERSION], appVersion);
 TString singleInstance;
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_APPLICATION_INSTANCE], singleInstance);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[CONFIG_APPLICATION_INSTANCE], singleInstance);
 if (singleInstance == _T("single")) {
 TString uniqueID = appName + FBootFields->FAppID + appVersion;
 // if another instance is running, later we can try to reactivate it
 return platform.CheckForSingleInstance(uniqueID);
 }
 FBootFields = new PackageBootFields();
 FDebugging = dsNone;
 FBootFields->FPackageRootDirectory = platform.GetPackageRootDirectory();
 FBootFields->FPackageAppDirectory = platform.GetPackageAppDirectory();
-FBootFields->FPackageLauncherDirectory = platform.GetPackageLauncherDirectory();
+FBootFields->FPackageLauncherDirectory =
+platform.GetPackageLauncherDirectory();
 FBootFields->FAppDataDirectory = platform.GetAppDataDirectory();
 std::map<TString, TString> keys = platform.GetKeys();
 // Read from configure.cfg/Info.plist
-AutoFreePtr<ISectionalPropertyContainer> config = platform.GetConfigFile(platform.GetConfigFileName());
+AutoFreePtr<ISectionalPropertyContainer> config =
+platform.GetConfigFile(platform.GetConfigFileName());
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_APP_ID_KEY], FBootFields->FAppID);
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[PACKAGER_APP_DATA_DIR], FBootFields->FPackageAppDataDirectory);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-FBootFields->FPackageAppDataDirectory = FilePath::FixPathForPlatform(FBootFields->FPackageAppDataDirectory);
+keys[CONFIG_APP_ID_KEY], FBootFields->FAppID);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[PACKAGER_APP_DATA_DIR], FBootFields->FPackageAppDataDirectory);
+FBootFields->FPackageAppDataDirectory =
+FilePath::FixPathForPlatform(FBootFields->FPackageAppDataDirectory);
 // Main JAR.
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_MAINJAR_KEY], FBootFields->FMainJar);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-FBootFields->FMainJar = FilePath::IncludeTrailingSeparater(GetPackageAppDirectory()) +
+keys[CONFIG_MAINJAR_KEY], FBootFields->FMainJar);
-FilePath::FixPathForPlatform(FBootFields->FMainJar);
+FBootFields->FMainJar =
+FilePath::IncludeTrailingSeparator(GetPackageAppDirectory())
++ FilePath::FixPathForPlatform(FBootFields->FMainJar);
 // Main Module.
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_MAINMODULE_KEY], FBootFields->FMainModule);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[CONFIG_MAINMODULE_KEY], FBootFields->FMainModule);
 // Classpath.
-// 1. If the provided class path contains main jar then only use provided class path.
+// 1. If the provided class path contains main jar then only use
+//    provided class path.
 // 2. If class path provided by config file is empty then add main jar.
 // 3. If main jar is not in provided class path then add it.
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_CLASSPATH_KEY], FBootFields->FClassPath);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-FBootFields->FClassPath = FilePath::FixPathSeparatorForPlatform(FBootFields->FClassPath);
+keys[CONFIG_CLASSPATH_KEY], FBootFields->FClassPath);
+FBootFields->FClassPath =
+FilePath::FixPathSeparatorForPlatform(FBootFields->FClassPath);
 if (FBootFields->FClassPath.empty() == true) {
 FBootFields->FClassPath = GetMainJar();
-}
+} else if (FBootFields->FClassPath.find(GetMainJar()) == TString::npos) {
-else if (FBootFields->FClassPath.find(GetMainJar()) == TString::npos) {
+FBootFields->FClassPath = GetMainJar()
-FBootFields->FClassPath = GetMainJar() + FilePath::PathSeparator() + FBootFields->FClassPath;
++ FilePath::PathSeparator() + FBootFields->FClassPath;
 }
 // Modulepath.
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_MODULEPATH_KEY], FBootFields->FModulePath);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-FBootFields->FModulePath = FilePath::FixPathSeparatorForPlatform(FBootFields->FModulePath);
+keys[CONFIG_MODULEPATH_KEY], FBootFields->FModulePath);
+FBootFields->FModulePath =
+FilePath::FixPathSeparatorForPlatform(FBootFields->FModulePath);
 // Main Class.
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_MAINCLASSNAME_KEY], FBootFields->FMainClassName);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[CONFIG_MAINCLASSNAME_KEY], FBootFields->FMainClassName);
 // Splash Screen.
-if (config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_SPLASH_KEY], FBootFields->FSplashScreenFileName) == true) {
+if (config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-FBootFields->FSplashScreenFileName = FilePath::IncludeTrailingSeparater(GetPackageAppDirectory()) +
+keys[CONFIG_SPLASH_KEY],
-FilePath::FixPathForPlatform(FBootFields->FSplashScreenFileName);
+FBootFields->FSplashScreenFileName) == true) {
+FBootFields->FSplashScreenFileName =
+FilePath::IncludeTrailingSeparator(GetPackageAppDirectory())
++ FilePath::FixPathForPlatform(FBootFields->FSplashScreenFileName);
 if (FilePath::FileExists(FBootFields->FSplashScreenFileName) == false) {
 FBootFields->FSplashScreenFileName = _T("");
 }
 }
 // Runtime.
-config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[JVM_RUNTIME_KEY], FBootFields->FJVMRuntimeDirectory);
+config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[JVM_RUNTIME_KEY], FBootFields->FJVMRuntimeDirectory);
 // Read jvmargs.
 PromoteAppCDSState(config);
 ReadJVMArgs(config);
 FBootFields->FArgs = Helpers::MapToNameValueList(args);
 }
 }
 // Read jvmuserarg defaults.
-config->GetSection(keys[CONFIG_SECTION_JVMUSEROPTIONS], FDefaultJVMUserArgs);
+config->GetSection(keys[CONFIG_SECTION_JVMUSEROPTIONS],
+FDefaultJVMUserArgs);
 // Load JVM user overrides.
 TString jvmUserArgsConfigFileName = GetJVMUserArgsConfigFileName();
 if (FilePath::FileExists(jvmUserArgsConfigFileName) == true) {
 // Load new location for user VM overrides.
 IniFile userConfig;
 if (userConfig.LoadFromFile(jvmUserArgsConfigFileName) == false) {
-// New property file format was not found, attempt to load old property file format.
+// New property file format was not found,
-userConfig.GetSection(keys[CONFIG_SECTION_JVMUSEROVERRIDESOPTIONS], FJVMUserArgsOverrides);
+// attempt to load old property file format.
-}
+userConfig.GetSection(keys[CONFIG_SECTION_JVMUSEROVERRIDESOPTIONS],
+FJVMUserArgsOverrides);
-userConfig.GetSection(keys[CONFIG_SECTION_JVMUSEROVERRIDESOPTIONS], FJVMUserArgsOverrides);
+}
-}
-else {
+userConfig.GetSection(keys[CONFIG_SECTION_JVMUSEROVERRIDESOPTIONS],
+FJVMUserArgsOverrides);
+} else {
 // Attemp to load java.util.prefs for legacy JVM user overrides.
-AutoFreePtr<JavaUserPreferences> javaPreferences(JavaUserPreferences::CreateInstance());
+AutoFreePtr<JavaUserPreferences> javaPreferences(
+JavaUserPreferences::CreateInstance());
 if (javaPreferences->Load(GetAppID()) == true) {
 FJVMUserArgsOverrides = javaPreferences->GetData();
 }
 }
 // Auto Memory.
 TString autoMemory;
-if (config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_APP_MEMORY], autoMemory) == true) {
+if (config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[CONFIG_APP_MEMORY], autoMemory) == true) {
 if (autoMemory == _T("auto") || autoMemory == _T("100%")) {
 FBootFields->FMemoryState = PackageBootFields::msAuto;
 FBootFields->FMemorySize = platform.GetMemorySize();
-}
+} else if (autoMemory.length() == 2 && isdigit(autoMemory[0]) &&
-else if (autoMemory.length() == 2 && isdigit(autoMemory[0]) && autoMemory[1] == '%') {
+autoMemory[1] == '%') {
 FBootFields->FMemoryState = PackageBootFields::msAuto;
-FBootFields->FMemorySize = StringToPercentageOfNumber(autoMemory.substr(0, 1), platform.GetMemorySize());
+FBootFields->FMemorySize =
-}
+StringToPercentageOfNumber(autoMemory.substr(0, 1),
-else if (autoMemory.length() == 3 && isdigit(autoMemory[0]) && isdigit(autoMemory[1]) && autoMemory[2] == '%') {
+platform.GetMemorySize());
+} else if (autoMemory.length() == 3 && isdigit(autoMemory[0]) &&
+isdigit(autoMemory[1]) && autoMemory[2] == '%') {
 FBootFields->FMemoryState = PackageBootFields::msAuto;
-FBootFields->FMemorySize = StringToPercentageOfNumber(autoMemory.substr(0, 2), platform.GetMemorySize());
+FBootFields->FMemorySize =
-}
+StringToPercentageOfNumber(autoMemory.substr(0, 2),
-else {
+platform.GetMemorySize());
+} else {
 FBootFields->FMemoryState = PackageBootFields::msManual;
 FBootFields->FMemorySize = 0;
 }
 }
 // Debug
 TString debug;
-if (config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_APP_DEBUG], debug) == true) {
+if (config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+keys[CONFIG_APP_DEBUG], debug) == true) {
 FBootFields->FArgs.push_back(debug);
 }
 MergeJVMDefaultsWithOverrides();
 }
 //
 // -> cdsUninitialized
 //    -> cdsGenCache If -Xappcds:generatecache
 //    -> cdsDisabled If -Xappcds:off
 //    -> cdsEnabled If "AppCDSJVMOptions" section is present
-//    -> cdsAuto If "AppCDSJVMOptions" section is present and app.appcds.cache=auto
+//    -> cdsAuto If "AppCDSJVMOptions" section is present and
+//               app.appcds.cache=auto
 //    -> cdsDisabled Default
 //
 void Package::PromoteAppCDSState(ISectionalPropertyContainer* Config) {
 Platform& platform = Platform::GetInstance();
 std::map<TString, TString> keys = platform.GetKeys();
 // Do nothing.
 break;
 }
 case cdsUninitialized: {
-if (Config->ContainsSection(keys[CONFIG_SECTION_APPCDSJVMOPTIONS]) == true) {
+if (Config->ContainsSection(
+keys[CONFIG_SECTION_APPCDSJVMOPTIONS]) == 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
+// If running with AppCDS enabled, and the configuration has
-// the launcher will attempt to generate the cache file automatically and run the application.
+// been setup so "auto" is enabled, then
-if (Config->GetValue(keys[CONFIG_SECTION_APPLICATION], _T("app.appcds.cache"), appCDSCacheValue) == true &&
+// the launcher will attempt to generate the cache file
+// automatically and run the application.
+if (Config->GetValue(keys[CONFIG_SECTION_APPLICATION],
+_T("app.appcds.cache"), appCDSCacheValue) == true &&
 appCDSCacheValue == _T("auto")) {
 platform.SetAppCDSState(cdsAuto);
 }
 else {
 platform.SetAppCDSState(cdsEnabled);
 }
-}
+} else {
-else {
 platform.SetAppCDSState(cdsDisabled);
 }
 }
 }
 // Evaluate based on the current AppCDS state.
 switch (platform.GetAppCDSState()) {
 case cdsUninitialized: {
 throw Exception(_T("Internal Error"));
 }
 case cdsDisabled: {
-Config->GetSection(keys[CONFIG_SECTION_JVMOPTIONS], FBootFields->FJVMArgs);
+Config->GetSection(keys[CONFIG_SECTION_JVMOPTIONS],
+FBootFields->FJVMArgs);
 break;
 }
 case cdsGenCache: {
-Config->GetSection(keys[CONFIG_SECTION_APPCDSGENERATECACHEJVMOPTIONS], FBootFields->FJVMArgs);
+Config->GetSection(keys[
+CONFIG_SECTION_APPCDSGENERATECACHEJVMOPTIONS],
+FBootFields->FJVMArgs);
 break;
 }
 case cdsAuto:
 case cdsEnabled: {
 if (Config->GetValue(keys[CONFIG_SECTION_APPCDSJVMOPTIONS],
-_T( "-XX:SharedArchiveFile"), FBootFields->FAppCDSCacheFileName) == true) {
+_T( "-XX:SharedArchiveFile"),
-// File names may contain the incorrect path separators. The cache file name must be
+FBootFields->FAppCDSCacheFileName) == true) {
-// corrected at this point.
+// File names may contain the incorrect path separators.
+// The cache file name must be corrected at this point.
 if (FBootFields->FAppCDSCacheFileName.empty() == false) {
 IniFile* iniConfig = dynamic_cast<IniFile*>(Config);
 if (iniConfig != NULL) {
-FBootFields->FAppCDSCacheFileName = FilePath::FixPathForPlatform(FBootFields->FAppCDSCacheFileName);
+FBootFields->FAppCDSCacheFileName =
-iniConfig->SetValue(keys[CONFIG_SECTION_APPCDSJVMOPTIONS],
+FilePath::FixPathForPlatform(
-_T( "-XX:SharedArchiveFile"), FBootFields->FAppCDSCacheFileName);
+FBootFields->FAppCDSCacheFileName);
+iniConfig->SetValue(keys[
+CONFIG_SECTION_APPCDSJVMOPTIONS],
+_T( "-XX:SharedArchiveFile"),
+FBootFields->FAppCDSCacheFileName);
 }
 }
-Config->GetSection(keys[CONFIG_SECTION_APPCDSJVMOPTIONS], FBootFields->FJVMArgs);
+Config->GetSection(keys[CONFIG_SECTION_APPCDSJVMOPTIONS],
+FBootFields->FJVMArgs);
 }
 break;
 }
 }
 void Package::SetCommandLineArguments(int argc, TCHAR* argv[]) {
 if (argc > 0) {
 std::list<TString> args;
-// Prepare app arguments. Skip value at index 0 - this is path to executable.
+// Prepare app arguments. Skip value at index 0 -
+// this is path to executable.
 FBootFields->FCommandName = argv[0];
 // Path to executable is at 0 index so start at index 1.
 for (int index = 1; index < argc; index++) {
 TString arg = argv[index];
 continue;
 }
 }
 if (arg == _T("-NSDocumentRevisionsDebugMode")) {
-// Ignore -NSDocumentRevisionsDebugMode and the following YES/NO
+// Ignore -NSDocumentRevisionsDebugMode and
+// the following YES/NO
 index++;
 continue;
 }
 #endif //MAC
 }
 }
 }
 Package& Package::GetInstance() {
-static Package instance; // Guaranteed to be destroyed. Instantiated on first use.
+static Package instance;
+// Guaranteed to be destroyed. Instantiated on first use.
 return instance;
 }
 Package::~Package(void) {
 FreeBootFields();
 OrderedMap<TString, TString> Package::GetJVMUserArgOverrides() {
 return FJVMUserArgsOverrides;
 }
-std::vector<TString> GetKeysThatAreNotDuplicates(OrderedMap<TString, TString> &Defaults,
+std::vector<TString> GetKeysThatAreNotDuplicates(OrderedMap<TString,
-OrderedMap<TString, TString> &Overrides) {
+TString> &Defaults, OrderedMap<TString, TString> &Overrides) {
 std::vector<TString> result;
 std::vector<TString> overrideKeys = Overrides.GetKeys();
 for (size_t index = 0; index < overrideKeys.size(); index++) {
 TString overridesKey = overrideKeys[index];
 }
 return result;
 }
-OrderedMap<TString, TString> CreateOrderedMapFromKeyList(OrderedMap<TString, TString> &Map,
+OrderedMap<TString, TString> CreateOrderedMapFromKeyList(OrderedMap<TString,
-std::vector<TString> &Keys) {
+TString> &Map, std::vector<TString> &Keys) {
 OrderedMap<TString, TString> result;
 for (size_t index = 0; index < Keys.size(); index++) {
 TString key = Keys[index];
 TString value;
 void Package::SetJVMUserArgOverrides(OrderedMap<TString, TString> Value) {
 OrderedMap<TString, TString> defaults = GetDefaultJVMUserArgs();
 OrderedMap<TString, TString> overrides = Value;
 // 1. Remove entries in the overrides that are the same as the defaults.
-std::vector<TString> overrideKeys = GetKeysThatAreNotDuplicates(defaults, overrides);
+std::vector<TString> overrideKeys =
+GetKeysThatAreNotDuplicates(defaults, overrides);
 // 2. Create an ordered map from the overrides that weren't removed.
-FJVMUserArgsOverrides = CreateOrderedMapFromKeyList(overrides, overrideKeys);
+FJVMUserArgsOverrides =
+CreateOrderedMapFromKeyList(overrides, overrideKeys);
 // 3. Overwrite JVM user config overrides with provided key/value pair.
 SaveJVMUserArgOverrides(FJVMUserArgsOverrides);
 // 4. Merge defaults and overrides to produce FJVMUserArgs.
 void Package::SaveJVMUserArgOverrides(OrderedMap<TString, TString> Data) {
 IniFile userConfig;
 Platform& platform = Platform::GetInstance();
 std::map<TString, TString> keys = platform.GetKeys();
-userConfig.AppendSection(keys[CONFIG_SECTION_JVMUSEROVERRIDESOPTIONS], Data);
+userConfig.AppendSection(
+keys[CONFIG_SECTION_JVMUSEROVERRIDESOPTIONS], Data);
 userConfig.SaveToFile(GetJVMUserArgsConfigFileName());
 }
 OrderedMap<TString, TString> Package::GetJVMUserArgs() {
 return FJVMUserArgs;
 }
-std::vector<TString> GetKeysThatAreNotOverridesOfDefaultValues(OrderedMap<TString, TString> &Defaults,
+std::vector<TString> GetKeysThatAreNotOverridesOfDefaultValues(
-OrderedMap<TString, TString> &Overrides) {
+OrderedMap<TString, TString> &Defaults, OrderedMap<TString,
+TString> &Overrides) {
 std::vector<TString> result;
 std::vector<TString> keys = Overrides.GetKeys();
 for (unsigned int index = 0; index< keys.size(); index++) {
 TString key = keys[index];
 return result;
 }
 void Package::MergeJVMDefaultsWithOverrides() {
-// Merge jvmuserarg defaults and jvmuserarg overrides to populate FJVMUserArgs.
+// Merge jvmuserarg defaults and jvmuserarg overrides to populate
-// 1. If the key is in the config file and not the java.user.preferences the default value is used,
+// FJVMUserArgs.
+// 1. If the key is in the config file and not the
+//    java.user.preferences the default value is used,
 //    the one from the config file.
-// 2. If the key is in the java.user.preferences then the value from the java.user.preferences is used and
+// 2. If the key is in the java.user.preferences then the value
+//    from the java.user.preferences is used and
 //    the config file value is ignored.
-// 3. If the key is not in the config file but it is in the java.user.preferences then it is added anyway.
+// 3. If the key is not in the config file but it is in
+//    the java.user.preferences then it is added anyway.
 //    And if it is removed it won't show back up.
 FJVMUserArgs.Clear();
 FJVMUserArgs.Append(FDefaultJVMUserArgs);
 OrderedMap<TString, TString> overrides = GetJVMUserArgOverrides();
 // 1. Iterate over all elements in overrides to see if any items
 //    override a default value.
-std::vector<TString> keys = GetKeysThatAreNotOverridesOfDefaultValues(FJVMUserArgs, overrides);
+std::vector<TString> keys =
+GetKeysThatAreNotOverridesOfDefaultValues(FJVMUserArgs, overrides);
 // 2. All remaining items in overrides are appended to the end.
 for (unsigned int index = 0; index< keys.size(); index++) {
 TString key = keys[index];
 TString Package::GetJVMUserArgsConfigFileName() {
 if (FJVMUserArgsConfigFileName.empty()) {
 Platform& platform = Platform::GetInstance();
-FJVMUserArgsConfigFileName = FilePath::IncludeTrailingSeparater(platform.GetAppDataDirectory()) +
+FJVMUserArgsConfigFileName = FilePath::IncludeTrailingSeparator(
-FilePath::IncludeTrailingSeparater(GetPackageAppDataDirectory()) +
+platform.GetAppDataDirectory())
-FilePath::IncludeTrailingSeparater(_T("packager")) +
++ FilePath::IncludeTrailingSeparator(
-_T("jvmuserargs.cfg");
+GetPackageAppDataDirectory())
++ FilePath::IncludeTrailingSeparator(_T("packager"))
++ _T("jvmuserargs.cfg");
 }
 return FJVMUserArgsConfigFileName;
 }
 TString Package::GetAppCDSCacheDirectory() {
 if (FAppCDSCacheDirectory.empty()) {
 Platform& platform = Platform::GetInstance();
-FAppCDSCacheDirectory = FilePath::IncludeTrailingSeparater(platform.GetAppDataDirectory()) +
+FAppCDSCacheDirectory = FilePath::IncludeTrailingSeparator(
-FilePath::IncludeTrailingSeparater(GetPackageAppDataDirectory()) +
+platform.GetAppDataDirectory())
-_T("cache");
++ FilePath::IncludeTrailingSeparator(
+GetPackageAppDataDirectory()) + _T("cache");
 Macros& macros = Macros::GetInstance();
 FAppCDSCacheDirectory = macros.ExpandMacros(FAppCDSCacheDirectory);
-FAppCDSCacheDirectory = FilePath::FixPathForPlatform(FAppCDSCacheDirectory);
+FAppCDSCacheDirectory =
+FilePath::FixPathForPlatform(FAppCDSCacheDirectory);
 }
 return FAppCDSCacheDirectory;
 }
 TString Package::GetAppCDSCacheFileName() {
 assert(FBootFields != NULL);
 if (FBootFields->FAppCDSCacheFileName.empty() == false) {
 Macros& macros = Macros::GetInstance();
-FBootFields->FAppCDSCacheFileName = macros.ExpandMacros(FBootFields->FAppCDSCacheFileName);
+FBootFields->FAppCDSCacheFileName =
-FBootFields->FAppCDSCacheFileName = FilePath::FixPathForPlatform(FBootFields->FAppCDSCacheFileName);
+macros.ExpandMacros(FBootFields->FAppCDSCacheFileName);
+FBootFields->FAppCDSCacheFileName =
+FilePath::FixPathForPlatform(FBootFields->FAppCDSCacheFileName);
 }
 return FBootFields->FAppCDSCacheFileName;
 }
 if (FBootFields->FJVMLibraryFileName.empty() == true) {
 Platform& platform = Platform::GetInstance();
 Macros& macros = Macros::GetInstance();
 TString jvmRuntimePath = macros.ExpandMacros(GetJVMRuntimeDirectory());
-FBootFields->FJVMLibraryFileName = platform.GetBundledJVMLibraryFileName(jvmRuntimePath);
+FBootFields->FJVMLibraryFileName =
+platform.GetBundledJVMLibraryFileName(jvmRuntimePath);
 }
 return FBootFields->FJVMLibraryFileName;
 }

branch	JDK-8200758-branch
changeset 56982	e094d5483bd6
parent 56854	aedce3eaaf17
child 56995	3d5b13207b70