[camel] branch master updated: Fixed setting manual auto commit on endpoint uri level. Thanks to Anand Banik for spotting this bug.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 612f672  Fixed setting manual auto commit on endpoint uri level. Thanks to Anand Banik for spotting this bug.
612f672 is described below

commit 612f672498133515e058b72c7d4bc15fcd21f630
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 8 14:31:55 2018 +0100

    Fixed setting manual auto commit on endpoint uri level. Thanks to Anand Banik for spotting this bug.
---
 .../src/main/java/org/apache/camel/component/kafka/KafkaComponent.java  | 1 -
 .../src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
index 6c83657..21e8c13 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
@@ -150,7 +150,6 @@ public class KafkaComponent extends DefaultComponent implements SSLContextParame
         this.breakOnFirstError = breakOnFirstError;
     }
 
-
     public boolean isAllowManualCommit() {
         return allowManualCommit;
     }
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index 72310e5..707c9a4 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -284,7 +284,7 @@ public class KafkaConsumer extends DefaultConsumer {
                                 if (!isAutoCommitEnabled()) {
                                     exchange.getIn().setHeader(KafkaConstants.LAST_RECORD_BEFORE_COMMIT, !recordIterator.hasNext());
                                 }
-                                if (endpoint.getComponent().isAllowManualCommit()) {
+                                if (endpoint.getConfiguration().isAllowManualCommit()) {
                                     // allow Camel users to access the Kafka consumer API to be able to do for example manual commits
                                     KafkaManualCommit manual = endpoint.getComponent().getKafkaManualCommitFactory().newInstance(exchange, consumer, topicName, threadId,
                                         offsetRepository, partition, partitionLastOffset);

-- 
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.