MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

CR-IC-6374

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-09-25 13:26:51 +02:00
parent 1fb4ef6b0d
commit 1d48ec4dfd
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java
+12 -11
View File
@@ -98,24 +98,25 @@ public class ServiceManagerImpl implements BaseComponent {
for (Object o : adapters) {
if (o instanceof MyComponentAdapter) {
MyComponentAdapter adapter = (MyComponentAdapter)o;
ComponentAdapter delegate = adapter.myDelegate;
PluginDescriptor pluginDescriptor = adapter.myPluginDescriptor;
Class aClass;
try {
// we cannot use getDelegate - not all components are instantiable (JobSchedulerImpl, for example, causes such error)
aClass = delegate == null ? adapter.loadClass(adapter.myDescriptor.getImplementation()) : delegate.getComponentImplementation();
}
catch (RuntimeException e) {
// ignore ClassNotFoundException - invalid entry (GithubSslSupport, for example)
if (e.getCause() instanceof ClassNotFoundException) {
LOG.warn(e);
continue;
ComponentAdapter delegate = adapter.myDelegate;
// avoid delegation creation & class initialization
if (delegate == null) {
ClassLoader classLoader = pluginDescriptor == null ? ServiceManagerImpl.class.getClassLoader() : pluginDescriptor.getPluginClassLoader();
aClass = Class.forName(adapter.myDescriptor.getImplementation(), false, classLoader);
}
else {
throw e;
aClass = delegate.getComponentImplementation();
}
}
catch (Throwable e) {
LOG.error(e);
continue;
}
if (!processor.process(aClass, adapter.myPluginDescriptor)) {
if (!processor.process(aClass, pluginDescriptor)) {
break;
}
}