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

use up to date TransactionGuard when dispatching swing events; hopefully this will fix flaky TransactionTest

Browse Source
This commit is contained in:
peter
2016-05-10 16:49:03 +02:00
parent 06fe6d214c
commit 48cce18d6c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+9 -2
View File
@@ -357,7 +357,6 @@ public class IdeEventQueue extends EventQueue {
boolean loaded = IdeaApplication.isLoaded();
if (loaded) {
ourAppIsLoaded = true;
ourTransactionGuard = (TransactionGuardImpl)TransactionGuard.getInstance();
}
return loaded;
}
@@ -389,7 +388,7 @@ public class IdeEventQueue extends EventQueue {
myCurrentEvent = e;
boolean userActivity = myIsInInputEvent || e instanceof ItemEvent;
try (AccessToken ignored = ourTransactionGuard == null ? null : ourTransactionGuard.startActivity(userActivity)) {
try (AccessToken ignored = startActivity(userActivity)) {
_dispatchEvent(e, false);
}
catch (Throwable t) {
@@ -409,6 +408,14 @@ public class IdeEventQueue extends EventQueue {
}
}
@Nullable
private static AccessToken startActivity(boolean userActivity) {
if (ourTransactionGuard == null && appIsLoaded()) {
ourTransactionGuard = (TransactionGuardImpl)TransactionGuard.getInstance();
}
return ourTransactionGuard == null ? null : ourTransactionGuard.startActivity(userActivity);
}
private void processException(Throwable t) {
if (!myToolkitBugsProcessor.process(t)) {
PluginManager.processException(t);