You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by he...@apache.org on 2015/03/02 20:37:32 UTC
camel git commit: Added explicit class exclusion to the
RoutesCollector condition.
Repository: camel
Updated Branches:
refs/heads/master ad35c0bbd -> 68ab0afec
Added explicit class exclusion to the RoutesCollector condition.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68ab0afe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68ab0afe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68ab0afe
Branch: refs/heads/master
Commit: 68ab0afec964f4626e457e1fcfdf3af7a5988c46
Parents: ad35c0b
Author: Henryk Konsek <he...@gmail.com>
Authored: Mon Mar 2 20:37:21 2015 +0100
Committer: Henryk Konsek <he...@gmail.com>
Committed: Mon Mar 2 20:37:29 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/spring/boot/CamelAutoConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68ab0afe/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 6bd39d3..dbc8028 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
@@ -59,7 +59,7 @@ public class CamelAutoConfiguration {
}
@Bean
- @ConditionalOnMissingBean
+ @ConditionalOnMissingBean(RoutesCollector.class)
RoutesCollector routesCollector(ApplicationContext applicationContext) {
Collection<CamelContextConfiguration> configurations = applicationContext.getBeansOfType(CamelContextConfiguration.class).values();
return new RoutesCollector(applicationContext, new ArrayList<CamelContextConfiguration>(configurations));