camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/4] camel git commit: CAMEL-11610: Fixed a bug introduced with recent rest-dsl fix for spring boot that caused rest-dsl being initialized while camel context is initializing so spring boot gives us null values.
Date Thu, 27 Jul 2017 14:17:21 GMT
CAMEL-11610: Fixed a bug introduced with recent rest-dsl fix for spring boot that caused rest-dsl
being initialized while camel context is initializing so spring boot gives us null values.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/acc19d20
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/acc19d20
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/acc19d20

Branch: refs/heads/camel-2.19.x
Commit: acc19d2054c79fbe1661b411bd24bfe58c09728d
Parents: b804706
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Jul 27 16:10:28 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Jul 27 16:16:29 2017 +0200

----------------------------------------------------------------------
 .../org/apache/camel/spring/boot/CamelAutoConfiguration.java   | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/acc19d20/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 8eac55d..96e0d52 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -410,12 +410,6 @@ public class CamelAutoConfiguration {
             camelContext.setSSLContextParameters(sslContextParametersSupplier.get());
         }
 
-        // rest-dsl global configuration
-        RestConfiguration restConfiguration = getSingleBeanOfType(applicationContext, RestConfiguration.class);
-        if (restConfiguration != null) {
-            camelContext.setRestConfiguration(restConfiguration);
-        }
-
         // set the default thread pool profile if defined
         initThreadPoolProfiles(applicationContext, camelContext);
     }


Mime
View raw message