You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/05/24 04:39:27 UTC
git commit: Fix ReadCallback.get() TimeUnit
Updated Branches:
refs/heads/trunk 22d117302 -> b2ba251ac
Fix ReadCallback.get() TimeUnit
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2ba251a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2ba251a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2ba251a
Branch: refs/heads/trunk
Commit: b2ba251ac60952fb96f34253340cf111677d17c8
Parents: 22d1173
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri May 24 05:39:17 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri May 24 05:39:17 2013 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/service/ReadCallback.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2ba251a/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 3e25aef..79e15b1 100644
--- a/src/java/org/apache/cassandra/service/ReadCallback.java
+++ b/src/java/org/apache/cassandra/service/ReadCallback.java
@@ -97,7 +97,7 @@ public class ReadCallback<TMessage, TResolved> implements IAsyncCallback<TMessag
public TResolved get() throws ReadTimeoutException, DigestMismatchException
{
- if (!await(command.getTimeout(), TimeUnit.MICROSECONDS))
+ if (!await(command.getTimeout(), TimeUnit.MILLISECONDS))
{
ReadTimeoutException ex = new ReadTimeoutException(consistencyLevel, received.get(), blockfor, resolver.isDataPresent());
if (logger.isDebugEnabled())