Repository: storm Updated Branches: refs/heads/1.x-branch 478babe45 -> a59007db5 refs/heads/master 582418952 -> ded5a0df1
STORM-1705: Fix cap-retry bug Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a59695e9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a59695e9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a59695e9 Branch: refs/heads/1.x-branch Commit: a59695e97953dc68b798f01df92c49b6df4b6abd Parents: 5c706af Author: Abhishek Agarwal <[email protected]> Authored: Fri Jun 10 21:18:40 2016 +0530 Committer: Abhishek Agarwal <[email protected]> Committed: Fri Jun 10 21:18:40 2016 +0530 ---------------------------------------------------------------------- .../org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/a59695e9/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java ---------------------------------------------------------------------- diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java index b2cfaf0..cacf73c 100644 --- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java +++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java @@ -106,7 +106,6 @@ public class ExponentialBackoffMsgRetryManager implements FailedMsgRetryManager MessageRetryRecord record = this.records.get(offset); return ! (record != null && this.retryLimit > 0 && - this.waiting.contains(record) && this.retryLimit <= record.retryNum); }
