[camel] branch master updated: CAMEL-14538: camel-core - Do not load type converters via package scanning by default

[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 ed25276  CAMEL-14538: camel-core - Do not load type converters via 
package scanning by default
ed25276 is described below

commit ed25276431087e83ff9ae1fc683963b1a0e4a1b6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Feb 12 10:44:25 2020 +0100

    CAMEL-14538: camel-core - Do not load type converters via package scanning 
by default
---
 .../java/org/apache/camel/impl/converter/DefaultTypeConverter.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
index 982ed75..e3f5f57 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
@@ -98,7 +98,8 @@ public class DefaultTypeConverter extends 
BaseTypeConverterRegistry {
 
     @Override
     protected void initTypeConverterLoaders() {
-        if (resolver != null) {
+        // only use Camel 2.x annotation based loaders if enabled
+        if (resolver != null && loadTypeConverters)  {
             typeConverterLoaders.add(new 
FastAnnotationTypeConverterLoader(resolver));
         }
     }