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

fix: compilation stuck on the unset semaphore if previous project opening was cancelled

Browse Source
This commit is contained in:
Eugene Zhuravlev
2009-09-24 21:18:44 +04:00
parent 080b5b6484
commit 1f36576777
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+1 -1
View File
@@ -359,7 +359,7 @@ public class CompileDriver {
if (message != null) {
compileContext.addMessage(message);
}
TranslatingCompilerFilesMonitor.getInstance().ensureInitializationCompleted();
TranslatingCompilerFilesMonitor.getInstance().ensureInitializationCompleted(myProject);
doCompile(compileContext, isRebuild, forceCompile, callback, checkCachesVersion, trackDependencies);
}
finally {
java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java
+28 -7
View File
@@ -34,7 +34,6 @@ import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
import com.intellij.openapi.vfs.newvfs.impl.NullVirtualFile;
import com.intellij.openapi.vfs.newvfs.persistent.FSRecords;
import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.containers.SLRUCache;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.indexing.IndexInfrastructure;
@@ -107,7 +106,8 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
};
private final ProjectManager myProjectManager;
private final Semaphore myInitializationInProgress = new Semaphore();
private final TIntHashSet mySuccessfullyInitialized = new TIntHashSet(); // projectId fior successfully initialized projects
private final Object myInitializationLock = new Object();
public TranslatingCompilerFilesMonitor(VirtualFileManager vfsManager, ProjectManager projectManager, Application application) {
myProjectManager = projectManager;
@@ -862,8 +862,22 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
}
public void ensureInitializationCompleted() {
myInitializationInProgress.waitFor();
public void ensureInitializationCompleted(Project project) {
final int id = getProjectId(project);
synchronized (myInitializationLock) {
while (!mySuccessfullyInitialized.contains(id)) {
if (!project.isOpen() || project.isDisposed()) {
// makes no sense to continue waiting
break;
}
try {
myInitializationLock.wait();
}
catch (InterruptedException ignored) {
break;
}
}
}
}
private void markOldOutputRoots(final Project project, final TIntObjectHashMap<Pair<Integer, Integer>> currentLayout) {
@@ -961,7 +975,6 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
});
myInitializationInProgress.down();
StartupManager.getInstance(project).runWhenProjectIsInitialized(new Runnable() {
public void run() {
new Task.Backgroundable(project, CompilerBundle.message("compiler.initial.scanning.progress.text"), false) {
@@ -1014,7 +1027,10 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
markOldOutputRoots(project, buildOutputRootsLayout(project));
}
finally {
myInitializationInProgress.up();
synchronized (myInitializationLock) {
mySuccessfullyInitialized.add(getProjectId(project));
myInitializationLock.notifyAll();
}
}
}
}.queue();
@@ -1023,9 +1039,14 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
public void projectClosed(final Project project) {
final int projectId = getProjectId(project);
synchronized (myInitializationLock) {
mySuccessfullyInitialized.remove(projectId);
myInitializationLock.notifyAll();
}
myConnections.remove(project).disconnect();
synchronized (mySourcesToRecompile) {
mySourcesToRecompile.remove(getProjectId(project));
mySourcesToRecompile.remove(projectId);
}
}
}