You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/05/24 07:39:42 UTC

[3/5] git commit: Ensure camel-spring-batch shutdowns properly.

Ensure camel-spring-batch shutdowns properly.


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

Branch: refs/heads/master
Commit: 68db90403c568d993f0921ac220a6942303fdc79
Parents: 60dd193
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 24 07:37:47 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 24 07:37:47 2013 +0200

----------------------------------------------------------------------
 .../spring/batch/support/CamelItemReader.java      |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/68db9040/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
index ca96d6e..fdd29f6 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.spring.batch.support;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
 import org.apache.camel.ConsumerTemplate;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -27,28 +26,21 @@ import org.slf4j.LoggerFactory;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.beans.factory.InitializingBean;
 
-public class CamelItemReader<I> extends ServiceSupport implements ItemReader<I>, InitializingBean, CamelContextAware {
+public class CamelItemReader<I> extends ServiceSupport implements ItemReader<I>, InitializingBean {
 
     private static final transient Logger LOG = LoggerFactory.getLogger(CamelItemReader.class);
 
-    private CamelContext camelContext;
+    private final CamelContext camelContext;
     private final ConsumerTemplate consumerTemplate;
 
     private final String endpointUri;
 
     public CamelItemReader(ConsumerTemplate consumerTemplate, String endpointUri) {
         this.consumerTemplate = consumerTemplate;
+        this.camelContext = consumerTemplate.getCamelContext();
         this.endpointUri = endpointUri;
     }
 
-    public CamelContext getCamelContext() {
-        return camelContext;
-    }
-
-    public void setCamelContext(CamelContext camelContext) {
-        this.camelContext = camelContext;
-    }
-
     @Override
     public void afterPropertiesSet() throws Exception {
         ObjectHelper.notNull(camelContext, "CamelContext", this);