kafka git commit: KAFKA-4728; KafkaConsumer#commitSync should copy its input
Repository: kafka Updated Branches: refs/heads/0.10.2 e321cd4f5 -> f4276b7cf KAFKA-4728; KafkaConsumer#commitSync should copy its input Author: Jan LukavskyReviewers: Jason Gustafson Closes #2491 from je-ik/KAFKA-4728 (cherry picked from commit b31a7a9022bfb645cb61e6fbc0b22829108b3a3f) Signed-off-by: Jason Gustafson Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/f4276b7c Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/f4276b7c Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/f4276b7c Branch: refs/heads/0.10.2 Commit: f4276b7cfb2aefd61a937b7138094b936e6bceca Parents: e321cd4 Author: Jan Lukavsky Authored: Mon Feb 6 11:47:45 2017 -0800 Committer: Jason Gustafson Committed: Mon Feb 6 11:48:05 2017 -0800 -- .../java/org/apache/kafka/clients/consumer/KafkaConsumer.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kafka/blob/f4276b7c/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java -- diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index ed3d607..d125e7e 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -1088,7 +1088,7 @@ public class KafkaConsumer implements Consumer { public void commitSync() { acquire(); try { -commitSync(subscriptions.allConsumed()); +coordinator.commitOffsetsSync(subscriptions.allConsumed(), Long.MAX_VALUE); } finally { release(); } @@ -1122,7 +1122,7 @@ public class KafkaConsumer implements Consumer { public void commitSync(final Map offsets) { acquire(); try { -coordinator.commitOffsetsSync(offsets, Long.MAX_VALUE); +coordinator.commitOffsetsSync(new HashMap<>(offsets), Long.MAX_VALUE); } finally { release(); }
kafka git commit: KAFKA-4728; KafkaConsumer#commitSync should copy its input
Repository: kafka Updated Branches: refs/heads/trunk 1f8a2ad2e -> b31a7a902 KAFKA-4728; KafkaConsumer#commitSync should copy its input Author: Jan LukavskyReviewers: Jason Gustafson Closes #2491 from je-ik/KAFKA-4728 Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/b31a7a90 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/b31a7a90 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/b31a7a90 Branch: refs/heads/trunk Commit: b31a7a9022bfb645cb61e6fbc0b22829108b3a3f Parents: 1f8a2ad Author: Jan Lukavsky Authored: Mon Feb 6 11:47:45 2017 -0800 Committer: Jason Gustafson Committed: Mon Feb 6 11:47:45 2017 -0800 -- .../java/org/apache/kafka/clients/consumer/KafkaConsumer.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kafka/blob/b31a7a90/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java -- diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index 89844f6..449efc9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -1088,7 +1088,7 @@ public class KafkaConsumer implements Consumer { public void commitSync() { acquire(); try { -commitSync(subscriptions.allConsumed()); +coordinator.commitOffsetsSync(subscriptions.allConsumed(), Long.MAX_VALUE); } finally { release(); } @@ -1122,7 +1122,7 @@ public class KafkaConsumer implements Consumer { public void commitSync(final Map offsets) { acquire(); try { -coordinator.commitOffsetsSync(offsets, Long.MAX_VALUE); +coordinator.commitOffsetsSync(new HashMap<>(offsets), Long.MAX_VALUE); } finally { release(); }