From 1d406f73ec6e5b907b56cffd2da9dfa4d8ca6f2c Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 7 May 2018 17:01:33 +0300 Subject: [PATCH] EA-107109 - PCE: AbstractProgressIndicatorBase.throwIfCanceled --- .../intellij/openapi/module/impl/ModuleManagerImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java index 4c09cd1e7311..102c15439138 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java @@ -14,10 +14,7 @@ import com.intellij.openapi.components.ServiceKt; import com.intellij.openapi.components.impl.stores.ModuleStore; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.*; -import com.intellij.openapi.progress.EmptyProgressIndicator; -import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.progress.ProgressIndicatorProvider; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.*; import com.intellij.openapi.progress.util.ProgressWrapper; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; @@ -300,6 +297,8 @@ public abstract class ModuleManagerImpl extends ModuleManager implements Disposa catch (IOException e) { reportError(errors, modulePath, e); } + catch (ProcessCanceledException ignore) { + } catch (Exception e) { LOG.error(e); }