[camel] branch master updated: Fixed OSGi type converter not loading the core fallback converters.

[da...@apache.org]

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.git


The following commit(s) were added to refs/heads/master by this push:
     new 369c382  Fixed OSGi type converter not loading the core fallback converters.
369c382 is described below

commit 369c382ea2dfab3384478c2f12953e6ca6a16776
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jun 3 10:24:53 2019 +0200

    Fixed OSGi type converter not loading the core fallback converters.
---
 .../src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index 0c31bc0..d99b10b 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -81,6 +81,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
         try {
             LOG.debug("loading type converter from bundle: {}", serviceReference.getBundle().getSymbolicName());
             if (delegate != null) {
+                ServiceHelper.startService(this.delegate);
                 loader.load(delegate);
             }
         } catch (Throwable t) {
@@ -233,7 +234,10 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
         // inject CamelContext
         answer.setCamelContext(camelContext);
 
+
         try {
+            // init before loading core converters
+            answer.init();
             // only load the core type converters, as OSGi activator will keep track on bundles
             // being installed/uninstalled and load type converters as part of that process
             answer.loadCoreTypeConverters();