cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject git commit: Fix CounterContext.ContextState.copyTo() method
Date Sun, 02 Feb 2014 07:31:03 GMT
Updated Branches:
  refs/heads/cassandra-2.0 8ecc6f111 -> b71372146


Fix CounterContext.ContextState.copyTo() method


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7137214
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7137214
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7137214

Branch: refs/heads/cassandra-2.0
Commit: b71372146135fdcee6353ec8254ebfd87c42f907
Parents: 8ecc6f1
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sun Feb 2 02:30:50 2014 -0500
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sun Feb 2 02:30:50 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/context/CounterContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7137214/src/java/org/apache/cassandra/db/context/CounterContext.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java
index 1fa4d60..48d2bd0 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -763,7 +763,7 @@ public class CounterContext implements IContext
             if (currentIsGlobal)
                 other.context.putShort(other.context.position() + other.headerOffset, (short)
(other.getElementIndex() + Short.MIN_VALUE));
             else if (currentIsLocal)
-                context.putShort(other.context.position() + other.headerOffset, (short) other.getElementIndex());
+                other.context.putShort(other.context.position() + other.headerOffset, (short)
other.getElementIndex());
 
             other.currentIsGlobal = currentIsGlobal;
             other.currentIsLocal = currentIsLocal;


Mime
View raw message