This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 6502a808b15e12dd7bee3423d6752e177082980c Author: Claus Ibsen <[email protected]> AuthorDate: Mon Nov 2 19:53:07 2020 +0100 CAMEL-15784: camel-core - Optimize with bootstrap factory finder. --- .../main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java | 3 --- .../java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java index 9f4cb23..aeda372 100644 --- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java +++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java @@ -17,7 +17,6 @@ package org.apache.camel.core.osgi; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.engine.BootstrapFactoryFinder; import org.apache.camel.util.ObjectHelper; import org.osgi.framework.BundleContext; import org.slf4j.Logger; @@ -41,8 +40,6 @@ public final class OsgiCamelContextHelper { camelContext.setClassResolver(new OsgiClassResolver(camelContext, bundleContext)); LOG.debug("Using OsgiFactoryFinderResolver"); camelContext.setFactoryFinderResolver(new OsgiFactoryFinderResolver(bundleContext)); - LOG.debug("Using OsgiFactoryFinder"); - camelContext.setBootstrapFactoryFinder(new OsgiFactoryFinder(bundleContext, camelContext.getClassResolver(), BootstrapFactoryFinder.DEFAULT_PATH)); LOG.debug("Using OsgiPackageScanClassResolver"); camelContext.setPackageScanClassResolver(new OsgiPackageScanClassResolver(bundleContext)); LOG.debug("Using OsgiComponentResolver"); diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java index 631c190..a6fc1af 100644 --- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java +++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java @@ -34,4 +34,9 @@ public class OsgiFactoryFinderResolver implements FactoryFinderResolver { return new OsgiFactoryFinder(bundleContext, classResolver, resourcePath); } + @Override + public FactoryFinder resolveBootstrapFactoryFinder(ClassResolver classResolver, String resourcePath) { + return new OsgiFactoryFinder(bundleContext, classResolver, resourcePath); + } + }
