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

project leaks: keep a list of started "scan file system" futures and kill em all at once

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-02-08 18:13:47 +03:00
parent fe4e38ca8f
commit 871ddc8085
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
+9 -2
View File
@@ -174,7 +174,7 @@ public class ProgressIndicatorUtils {
CompletableFuture<?> future = new CompletableFuture<>();
//noinspection SSBasedInspection
EdtInvocationManager.getInstance().invokeLater(() -> {
if (application.isDisposed()) {
if (application.isDisposed() || progressIndicator.isCanceled()) {
future.complete(null);
return;
}
@@ -193,7 +193,14 @@ public class ProgressIndicatorUtils {
executor.execute(new Runnable() {
@Override
public void run() {
final ReadTask.Continuation continuation = runUnderProgress(progressIndicator, readTask);
final ReadTask.Continuation continuation;
try {
continuation = runUnderProgress(progressIndicator, readTask);
}
catch (Throwable e) {
future.completeExceptionally(e);
throw e;
}
if (continuation == null) {
future.complete(null);
}