mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IJPL-207057: fix CancellationException processing
GitOrigin-RevId: ff9bf8ed309c7682f4b07ab399d09af3cc43684c
This commit is contained in:
committed by
intellij-monorepo-bot
parent
9da83c2438
commit
cd870da835
@@ -19,7 +19,6 @@ import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
|
||||
import com.intellij.openapi.module.Module;
|
||||
import com.intellij.openapi.module.ModuleManager;
|
||||
import com.intellij.openapi.progress.EmptyProgressIndicator;
|
||||
import com.intellij.openapi.progress.ProcessCanceledException;
|
||||
import com.intellij.openapi.progress.ProgressIndicator;
|
||||
import com.intellij.openapi.progress.ProgressManager;
|
||||
import com.intellij.openapi.progress.impl.CoreProgressManager;
|
||||
@@ -69,6 +68,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CancellationException;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentLinkedDeque;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
@@ -277,11 +277,12 @@ final class FindInProjectTask {
|
||||
LOG.debug("Search completed in " + TimeoutUtil.getDurationMillis(searchStartedAtNs) + " ms");
|
||||
}
|
||||
}
|
||||
catch (ProcessCanceledException e) {
|
||||
catch (CancellationException e) {
|
||||
processPresentation.setCanceled(true);
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Search canceled after " + TimeoutUtil.getDurationMillis(searchStartedAtNs) + " ms", new Exception(e));
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
catch (Throwable th) {
|
||||
LOG.error(th);
|
||||
|
||||
Reference in New Issue
Block a user