You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jk...@apache.org on 2014/03/05 23:37:58 UTC
git commit: KAFKA-1286: Trivial fix up: Use || instead of |.
Repository: kafka
Updated Branches:
refs/heads/trunk 2404191be -> 4524f384d
KAFKA-1286: Trivial fix up: Use || instead of |.
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/4524f384
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/4524f384
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/4524f384
Branch: refs/heads/trunk
Commit: 4524f384dc041f33297b47b181be6b59061577b4
Parents: 2404191
Author: Jay Kreps <ja...@gmail.com>
Authored: Wed Mar 5 14:35:07 2014 -0800
Committer: Jay Kreps <ja...@gmail.com>
Committed: Wed Mar 5 14:35:07 2014 -0800
----------------------------------------------------------------------
.../kafka/clients/producer/internals/RecordAccumulator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/4524f384/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java
index e455987..616e100 100644
--- a/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java
+++ b/clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java
@@ -195,8 +195,8 @@ public final class RecordAccumulator {
boolean backingOff = batch.attempts > 0 && batch.lastAttempt + retryBackoffMs > now;
boolean full = deque.size() > 1 || !batch.records.buffer().hasRemaining();
boolean expired = now - batch.created >= lingerMs;
- boolean sendable = full | expired | exhausted | closed;
- if (sendable & !backingOff)
+ boolean sendable = full || expired || exhausted || closed;
+ if (sendable && !backingOff)
ready.add(batch.topicPartition);
}
}