You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/06/10 19:23:40 UTC

[3/3] storm git commit: STORM-1705: Fix cap-retry bug

STORM-1705: Fix cap-retry bug

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


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

Branch: refs/heads/master
Commit: ded5a0df1510313ae2dce8869dbabaad6567452d
Parents: 5824189
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Fri Jun 10 21:18:40 2016 +0530
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jun 10 14:02:02 2016 -0400

----------------------------------------------------------------------
 .../org/apache/storm/kafka/ExponentialBackoffMsgRetryManager.java   | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/ded5a0df/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);
     }