[camel] branch master updated: Optimize a bit

[davsclaus]

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 69732ec  Optimize a bit
69732ec is described below

commit 69732ece14699a2d0eb6d68a65a49a6b0e7f42d2
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jan 3 14:05:38 2020 +0100

    Optimize a bit
---
 .../impl/converter/BaseTypeConverterRegistry.java      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index c6f3ea5..48a0ff9 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -525,10 +525,20 @@ public abstract class BaseTypeConverterRegistry extends 
ServiceSupport implement
         Collection<String> names = findTypeConverterLoaderClasses();
         for (String name : names) {
             log.debug("Resolving TypeConverterLoader: {}", name);
-            Class clazz = getResolver().getClassLoaders().stream()
-                    .map(cl -> ObjectHelper.loadClass(name, cl))
-                    .filter(Objects::nonNull)
-                    .findAny().orElseThrow(() -> new 
ClassNotFoundException(name));
+            Class clazz = null;
+            for (ClassLoader loader : getResolver().getClassLoaders()) {
+                try {
+                    clazz = loader.loadClass(name);
+                } catch (Throwable e) {
+                    // ignore
+                }
+                if (clazz != null) {
+                    break;
+                }
+            }
+            if (clazz == null) {
+                throw new ClassNotFoundException(name);
+            }
             Object obj = getInjector().newInstance(clazz, false);
             if (obj instanceof TypeConverterLoader) {
                 TypeConverterLoader loader = (TypeConverterLoader) obj;