You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/04 16:27:50 UTC
git commit: fix time conversion to milliseconds in
SimpleCondition.await
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 c454807a7 -> 9eb346a64
fix time conversion to milliseconds in SimpleCondition.await
patch by jzhang reviewed by dbrosius for cassandra-7149
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9eb346a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9eb346a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9eb346a6
Branch: refs/heads/cassandra-1.2
Commit: 9eb346a6432e952a1892f77c0cf6fda9b40ba1c4
Parents: c454807
Author: Jianwei Zhang <ee...@gmail.com>
Authored: Sun May 4 10:25:38 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun May 4 10:25:38 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/utils/SimpleCondition.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9eb346a6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 484f4bd..1c6171e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
* Always clean up references in SerializingCache (CASSANDRA-6994)
* fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
* Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
+ * fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149)
1.2.16
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9eb346a6/src/java/org/apache/cassandra/utils/SimpleCondition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SimpleCondition.java b/src/java/org/apache/cassandra/utils/SimpleCondition.java
index 4f00998..8899a19 100644
--- a/src/java/org/apache/cassandra/utils/SimpleCondition.java
+++ b/src/java/org/apache/cassandra/utils/SimpleCondition.java
@@ -44,7 +44,7 @@ public class SimpleCondition implements Condition
// micro/nanoseconds not supported
assert unit == TimeUnit.DAYS || unit == TimeUnit.HOURS || unit == TimeUnit.MINUTES || unit == TimeUnit.SECONDS || unit == TimeUnit.MILLISECONDS;
- long end = System.currentTimeMillis() + unit.convert(time, TimeUnit.MILLISECONDS);
+ long end = System.currentTimeMillis() + TimeUnit.MILLISECONDS.convert(time, unit);
while (!set && end > System.currentTimeMillis())
{
TimeUnit.MILLISECONDS.timedWait(this, end - System.currentTimeMillis());