MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-CR-44826 newConfigFolder check must be performed before system directories are locked

Browse Source
This commit is contained in:
Vladimir Krivosheev
2019-03-14 21:36:03 +01:00
parent a0b82a72fb
commit 02dbd03cb2
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+3 -5
View File
@@ -127,6 +127,9 @@ public class StartupUtil {
System.exit(Main.JDK_CHECK_FAILED);
}
// this check must be performed before system directories are locked
boolean newConfigFolder = !Main.isHeadless() && !new File(PathManager.getConfigPath()).exists();
Callable<Logger> task = () -> {
Activity activity = ParallelActivity.PREPARE_APP_INIT.start(ActivitySubNames.CHECK_SYSTEM_DIR);
// note: uses config folder!
@@ -179,7 +182,6 @@ public class StartupUtil {
activity.end();
}
boolean newConfigFolder = false;
try {
Activity activity = StartUpMeasurer.start(Phases.WAIT_TASKS);
if (!futures.isEmpty()) {
@@ -188,10 +190,6 @@ public class StartupUtil {
}
}
if (!Main.isHeadless()) {
newConfigFolder = !new File(PathManager.getConfigPath()).exists();
}
if (pooledActivitiesFuture != null) {
log = pooledActivitiesFuture.get();
}