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

IDEA-242605 PCE must not be logged during indexing in DomExtenderEP

Browse Source 
IDEA-243959 PCE must not be logged from XmlExtensionAdapter

GitOrigin-RevId: 8441e5aa9e11189a5e731b130ed753b4d24614c1
This commit is contained in:
Vladimir Krivosheev
2020-06-18 20:00:12 +03:00
committed by intellij-monorepo-bot
parent 4f37b2da81
commit e346358eaa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/concurrency/AppScheduledExecutorService.java
+3 -2
View File
@@ -1,8 +1,9 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.util.concurrency;
import com.intellij.diagnostic.ThreadDumper;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.LowMemoryWatcherManager;
import com.intellij.util.IncorrectOperationException;
@@ -135,7 +136,7 @@ public final class AppScheduledExecutorService extends SchedulingWrapper {
@Override
protected void afterExecute(Runnable r, Throwable t) {
if (t != null) {
if (t != null && !(t instanceof ProcessCanceledException)) {
Logger.getInstance(SchedulingWrapper.class).error("Worker exited due to exception", t);
}
}
xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java
+4
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.extensions.PluginAware;
import com.intellij.openapi.extensions.PluginDescriptor;
import com.intellij.openapi.extensions.RequiredElement;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.impl.DomInvocationHandler;
@@ -70,6 +71,9 @@ public final class DomExtenderEP implements PluginAware {
try {
myExtender = project.instantiateExtensionWithPicoContainerOnlyIfNeeded(extenderClassName, pluginDescriptor);
}
catch (ProcessCanceledException e) {
throw e;
}
catch (Throwable e) {
LOG.error(e);
return registrar;