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

concurrent root iteration on startup should be under a progress that's canceled on project closing (EA-68060 - assert: DirectoryIndexImpl.checkAvailability)

Browse Source
This commit is contained in:
peter
2015-07-20 20:18:15 +02:00
parent 26b7e75ef4
commit 85f94d9c28
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdaterImpl.java
+12 -2
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressWrapper;
import com.intellij.openapi.project.DumbModeTask;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
@@ -298,14 +299,23 @@ public class PushedFilePropertiesUpdaterImpl extends PushedFilePropertiesUpdater
for(Runnable r:tasks) r.run();
return;
}
final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator();
assert progress != null;
final ConcurrentLinkedQueue<Runnable> tasksQueue = new ConcurrentLinkedQueue<Runnable>(tasks);
Future<?> result = null;
if (tasks.size() > 1) {
result = ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
@Override
public void run() {
Runnable runnable;
while ((runnable = tasksQueue.poll()) != null) runnable.run();
ProgressManager.getInstance().runProcess(new Runnable() {
@Override
public void run() {
Runnable runnable;
while ((runnable = tasksQueue.poll()) != null) runnable.run();
}
}, ProgressWrapper.wrap(progress));
}
});
}