DSM project disposed checks

This commit is contained in:
Bas Leijdekkers
2014-03-28 13:41:09 +01:00
parent a8bfd9c147
commit 47ab9b5121
2 changed files with 11 additions and 3 deletions
@@ -280,7 +280,9 @@ public class CompileDriver {
}
finally {
result.set(COMPILE_SERVER_BUILD_STATUS.get(compileContext));
CompilerCacheManager.getInstance(myProject).flushCaches();
if (!myProject.isDisposed()) {
CompilerCacheManager.getInstance(myProject).flushCaches();
}
}
}
};
@@ -48,8 +48,11 @@ public abstract class BaseClassesAnalysisAction extends BaseAnalysisAction {
indicator.setIndeterminate(true);
indicator.setText(AnalysisScopeBundle.message("checking.class.files"));
final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
final boolean upToDate = compilerManager.isUpToDate(compilerManager.createProjectCompileScope(myProject));
if (project.isDisposed()) {
return;
}
final CompilerManager compilerManager = CompilerManager.getInstance(project);
final boolean upToDate = compilerManager.isUpToDate(compilerManager.createProjectCompileScope(project));
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
@@ -92,6 +95,9 @@ public abstract class BaseClassesAnalysisAction extends BaseAnalysisAction {
}
private void compileAndAnalyze(final Project project, final AnalysisScope scope) {
if (project.isDisposed()) {
return;
}
final CompilerManager compilerManager = CompilerManager.getInstance(project);
compilerManager.make(compilerManager.createProjectCompileScope(project), new CompileStatusNotification() {
@Override