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 2014/02/20 00:48:48 UTC

git commit: CASSANDRA-6742 follow up

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 d5c3d2fa5 -> 974a3cc12


CASSANDRA-6742 follow up


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

Branch: refs/heads/cassandra-2.1
Commit: 974a3cc1288f2bf530fd440585ef43ee82e84b3a
Parents: d5c3d2f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Feb 20 02:48:21 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Feb 20 02:48:27 2014 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/974a3cc1/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
index 7d966ac..24a0755 100644
--- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
@@ -46,7 +46,8 @@ public class ArrayBackedSortedColumns extends ColumnFamily
     private DeletionInfo deletionInfo;
 
     private Cell[] cells;
-    private int size;
+
+    private volatile int size;
     private volatile int sortedSize;
 
     public static final ColumnFamily.Factory<ArrayBackedSortedColumns> factory = new Factory<ArrayBackedSortedColumns>()
@@ -249,8 +250,7 @@ public class ArrayBackedSortedColumns extends ColumnFamily
      */
     private void internalAppend(Cell cell)
     {
-        cells[size] = cell;
-        size++;
+        cells[size++] = cell;
     }
 
     /**