svn commit: r982604 - /cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java

[jbellis]

Author: jbellis
Date: Thu Aug  5 13:14:59 2010
New Revision: 982604

URL: http://svn.apache.org/viewvc?rev=982604&view=rev
Log:
add TimeUnit.convert call to AsyncResult.  patch by Martin Hentschel; reviewed 
by jbellis for CASSANDRA-1362

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java?rev=982604&r1=982603&r2=982604&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java Thu Aug  
5 13:14:59 2010
@@ -53,6 +53,7 @@ class AsyncResult implements IAsyncResul
             {
                 if (!done.get())
                 {
+                    timeout = TimeUnit.MILLISECONDS.convert(timeout, tu);
                     long overall_timeout = timeout - 
(System.currentTimeMillis() - startTime);
                     bVal = overall_timeout > 0 && 
condition.await(overall_timeout, TimeUnit.MILLISECONDS);
                 }