Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b4a8dd4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b4a8dd4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b4a8dd4 Branch: refs/heads/trunk Commit: 4b4a8dd4f04cef4dcd4943cf0ac9a5b3c58c5272 Parents: 10b6173 5f60fcc Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Feb 12 20:57:51 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Feb 12 20:57:51 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/ReadCallback.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4a8dd4/src/java/org/apache/cassandra/service/ReadCallback.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/ReadCallback.java index 0c0d50c,777ef90..c43feaa --- a/src/java/org/apache/cassandra/service/ReadCallback.java +++ b/src/java/org/apache/cassandra/service/ReadCallback.java @@@ -98,10 -96,7 +98,8 @@@ public class ReadCallback<TMessage, TRe if (!await(command.getTimeout(), TimeUnit.MILLISECONDS)) { // Same as for writes, see AbstractWriteResponseHandler - int acks = received; - if (resolver.isDataPresent() && acks >= blockfor) - acks = blockfor - 1; - ReadTimeoutException ex = new ReadTimeoutException(consistencyLevel, received.get(), blockfor, resolver.isDataPresent()); + ReadTimeoutException ex = new ReadTimeoutException(consistencyLevel, received, blockfor, resolver.isDataPresent()); ++ if (logger.isDebugEnabled()) logger.debug("Read timeout: {}", ex.toString()); throw ex;
