[camel] branch master updated: [CAMEL-13664]add previous BundleTypeConverterLoader as fallback

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang 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 24b7cf6  [CAMEL-13664]add previous BundleTypeConverterLoader as 
fallback
24b7cf6 is described below

commit 24b7cf6090aa6c4476bc2265385aa21bd5ca02d4
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Mon Jun 24 12:09:08 2019 -0400

    [CAMEL-13664]add previous BundleTypeConverterLoader as fallback
---
 .../src/main/java/org/apache/camel/core/osgi/impl/Activator.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
 
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index 115baa1..25f809e 100644
--- 
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
+++ 
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -252,7 +252,10 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer<Objec
                                 new BundleTypeConverterLoader(bundle, url3 != 
null);
                             
bundleTypeConverterLoader.setTypeConverterLoader((TypeConverterLoader)clazz.newInstance());
                             resolvers.add(bundleTypeConverterLoader);
+                            BundleTypeConverterLoader 
fallBackBundleTypeConverterLoader =
+                                new BundleTypeConverterLoader(bundle, url3 != 
null);
                             // the class could be found and loaded so continue 
to next
+                            resolvers.add(fallBackBundleTypeConverterLoader);
                             continue;
                         } catch (Throwable t) {
                             // Ignore