Updated Branches: refs/heads/cassandra-2.0 de6a74a2d -> 5f60fcc39
remove dead code Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f60fcc3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f60fcc3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f60fcc3 Branch: refs/heads/cassandra-2.0 Commit: 5f60fcc39c9ac8958bd2d8565404515f919d8124 Parents: de6a74a Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Feb 12 20:50:35 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Feb 12 20:50:35 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/ReadCallback.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f60fcc3/src/java/org/apache/cassandra/service/ReadCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ReadCallback.java b/src/java/org/apache/cassandra/service/ReadCallback.java index afff530..777ef90 100644 --- a/src/java/org/apache/cassandra/service/ReadCallback.java +++ b/src/java/org/apache/cassandra/service/ReadCallback.java @@ -96,9 +96,6 @@ public class ReadCallback<TMessage, TResolved> implements IAsyncCallback<TMessag if (!await(command.getTimeout(), TimeUnit.MILLISECONDS)) { // Same as for writes, see AbstractWriteResponseHandler - int acks = received.get(); - if (resolver.isDataPresent() && acks >= blockfor) - acks = blockfor - 1; ReadTimeoutException ex = new ReadTimeoutException(consistencyLevel, received.get(), blockfor, resolver.isDataPresent()); if (logger.isDebugEnabled()) logger.debug("Read timeout: {}", ex.toString());
