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

instantiate actions outside of lock (IDEA-160763)

Browse Source
This commit is contained in:
peter
2016-09-07 12:47:22 +02:00
parent 6282725f9f
commit 0bfe0331a9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+12 -8
View File
@@ -482,20 +482,25 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
}
private AnAction getActionImpl(String id, boolean canReturnStub) {
AnAction action;
synchronized (myLock) {
AnAction action = myId2Action.get(id);
if (!canReturnStub && action instanceof ActionStub) {
action = convert((ActionStub)action);
action = myId2Action.get(id);
if (canReturnStub || !(action instanceof ActionStub)) {
return action;
}
}
AnAction converted = convertStub((ActionStub)action);
synchronized (myLock) {
action = myId2Action.get(id);
if (action instanceof ActionStub) {
action = replaceStub((ActionStub)action, converted);
}
return action;
}
}
/**
* Converts action's stub to normal action.
*/
@NotNull
private AnAction convert(@NotNull ActionStub stub) {
private AnAction replaceStub(@NotNull ActionStub stub, AnAction anAction) {
LOG.assertTrue(myAction2Id.containsKey(stub));
myAction2Id.remove(stub);
@@ -505,7 +510,6 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
LOG.assertTrue(action != null);
LOG.assertTrue(action.equals(stub));
AnAction anAction = convertStub(stub);
myAction2Id.put(anAction, stub.getId());
return addToMap(stub.getId(), anAction, stub.getPluginId(), stub.getProjectType());