camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hekon...@apache.org
Subject camel git commit: [Spring Boot] Removed obsolete CamelContext injection.
Date Sun, 15 Feb 2015 21:49:19 GMT
Repository: camel
Updated Branches:
  refs/heads/master 2d1c39329 -> 6bcc0b611


[Spring Boot] Removed obsolete CamelContext injection.


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

Branch: refs/heads/master
Commit: 6bcc0b6110a762623888ded294c78dc168a18e75
Parents: 2d1c393
Author: Henryk Konsek <hekonsek@gmail.com>
Authored: Sun Feb 15 22:49:08 2015 +0100
Committer: Henryk Konsek <hekonsek@gmail.com>
Committed: Sun Feb 15 22:49:08 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/6bcc0b61/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 9905eb9..6bd39d3 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
@@ -95,10 +95,12 @@ public class CamelAutoConfiguration {
         return properties;
     }
 
+    /**
+     * Camel post processor - required to support Camel annotations.
+     */
     @Bean
-    CamelBeanPostProcessor camelBeanPostProcessor(CamelContext camelContext, ApplicationContext
applicationContext) {
+    CamelBeanPostProcessor camelBeanPostProcessor(ApplicationContext applicationContext)
{
         CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
-        processor.setCamelContext(camelContext);
         processor.setApplicationContext(applicationContext);
         return processor;
     }


Mime
View raw message