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-150169 IDE blocked on save due to AntConfigurationBase

Browse Source
This commit is contained in:
Eugene Zhuravlev
2016-01-08 22:25:05 +01:00
parent 658ad10c59
commit b547307da8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
+7 -1
View File
@@ -197,6 +197,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
}
private volatile Boolean myIsInitialized = null;
private volatile Thread myInitThread = null;
public boolean isInitialized() {
final Boolean initialized = myIsInitialized;
@@ -667,7 +668,10 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
}
private List<ExecutionEvent> getEventsByClass(Class eventClass) {
ensureInitialized();
final Thread initThread = myInitThread;
if (initThread == null || initThread != Thread.currentThread()) {
ensureInitialized();
}
final List<ExecutionEvent> list = new ArrayList<ExecutionEvent>();
synchronized (myEventToTargetMap) {
for (final ExecutionEvent event : myEventToTargetMap.keySet()) {
@@ -716,6 +720,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
ApplicationManager.getApplication().runReadAction(new Runnable() {
public void run() {
try {
myInitThread = Thread.currentThread();
// first, remove existing files
final AntBuildFile[] currentFiles = getBuildFiles();
for (AntBuildFile file : currentFiles) {
@@ -800,6 +805,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
updateRegisteredActions();
}
finally {
myInitThread = null;
myIsInitialized = Boolean.TRUE;
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {