From a35f5ce9e54f5a995d98b7782fe1c572404b7733 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 8 Dec 2016 15:38:14 +0100
Subject: [PATCH] Cleanup (PCE logging)

---
 .../intellij/openapi/options/ConfigurableEP.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
index d075d0858553..bbd3417056ba 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import com.intellij.CommonBundle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.AbstractExtensionPointBean;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.AtomicNotNullLazyValue;
 import com.intellij.util.xmlb.annotations.AbstractCollection;
@@ -346,14 +347,11 @@ public class ConfigurableEP<T extends UnnamedConfigurable> extends AbstractExten
       try {
         return instantiate(myType, myContainer, true);
       }
-      catch (AssertionError error) {
-        LOG.error(error);
+      catch (ProcessCanceledException exception) {
+        throw exception;
       }
-      catch (LinkageError error) {
-        LOG.error(error);
-      }
-      catch (Exception exception) {
-        LOG.error(exception);
+      catch (AssertionError | LinkageError | Exception e) {
+        LOG.error(e);
       }
       return null;
     }
@@ -367,4 +365,4 @@ public class ConfigurableEP<T extends UnnamedConfigurable> extends AbstractExten
       return myType;
     }
   }
-}
+}
\ No newline at end of file