Repository: camel Updated Branches: refs/heads/master 9c01dc084 -> 7f87c6304
CAMEL-10524: adding condition on servlet Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f87c630 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f87c630 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f87c630 Branch: refs/heads/master Commit: 7f87c63042c3ef2fd71935bef7c199f053e595ff Parents: 9c01dc0 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Fri Nov 25 19:11:11 2016 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Fri Nov 25 19:11:11 2016 +0100 ---------------------------------------------------------------------- .../servlet/springboot/ServletMappingAutoConfiguration.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7f87c630/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java index b1e619d..89111aa 100644 --- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java +++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java @@ -17,6 +17,8 @@ package org.apache.camel.component.servlet.springboot; import org.apache.camel.component.servlet.CamelHttpTransportServlet; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -29,6 +31,8 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConditionalOnProperty(name = "camel.component.servlet.mapping.enabled", matchIfMissing = true) +@ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration") +@AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @ConditionalOnWebApplication @EnableConfigurationProperties(ServletMappingConfiguration.class) public class ServletMappingAutoConfiguration {
