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

StartupManager: avoid data races

Browse Source 
when registering post-startup activity from a bg thread, after project closing but before disposing
This commit is contained in:
peter
2017-04-11 10:27:09 +02:00
parent 612b133c60
commit 48a43ddbb1
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java
+18 -20
View File
@@ -203,7 +203,10 @@ public class StartupManagerImpl extends StartupManagerEx {
dumbService.runWhenSmart(this);
}
else {
myPostStartupActivitiesPassed = true;
//noinspection SynchronizeOnThis
synchronized (this) {
myPostStartupActivitiesPassed = true;
}
}
}
});
@@ -362,28 +365,23 @@ public class StartupManagerImpl extends StartupManagerEx {
final Application application = ApplicationManager.getApplication();
if (application == null) return;
//noinspection SynchronizeOnThis
synchronized (this) {
// in tests which simulate project opening, post-startup activities could have been run already.
// Then we should act as if the project was initialized
boolean initialized = myProject.isInitialized() || myProject.isDefault() || application.isUnitTestMode() && myPostStartupActivitiesPassed;
if (!initialized) {
registerPostStartupActivity(action);
return;
}
}
Runnable runnable = () -> {
if (!myProject.isDisposed()) {
action.run();
if (myProject.isDisposed()) return;
//noinspection SynchronizeOnThis
synchronized (this) {
// in tests which simulate project opening, post-startup activities could have been run already.
// Then we should act as if the project was initialized
boolean initialized = myProject.isInitialized() || myProject.isDefault() || application.isUnitTestMode() && myPostStartupActivitiesPassed;
if (!initialized) {
registerPostStartupActivity(action);
return;
}
}
action.run();
};
if (application.isDispatchThread()) {
runnable.run();
}
else {
application.invokeLater(runnable, ModalityState.NON_MODAL);
}
GuiUtils.invokeLaterIfNeeded(runnable, ModalityState.NON_MODAL);
}
@TestOnly