From 68e2a19e1cd63ff5e74627706f4bcd0f31242d52 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 17 Jun 2016 11:12:16 +0300 Subject: [PATCH] dispose indicator even after exception --- .../daemon/impl/DaemonProgressIndicator.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java index c9a954a2a62d..4667f523bf50 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java @@ -54,6 +54,12 @@ public class DaemonProgressIndicator extends AbstractProgressIndicatorBase imple Disposer.dispose(this); } + public void cancel(@NotNull Throwable cause) { + myTraceableDisposable.killExceptionally(cause); + super.cancel(); + Disposer.dispose(this); + } + // called when canceled @Override public void dispose() { @@ -70,11 +76,6 @@ public class DaemonProgressIndicator extends AbstractProgressIndicatorBase imple super.checkCanceled(); } - public void cancel(@NotNull Throwable cause) { - myTraceableDisposable.killExceptionally(cause); - super.cancel(); - } - @Override public void start() { assert !isCanceled() : "canceled";