You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/04/30 19:45:55 UTC

[3/3] git commit: fix build

fix build


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

Branch: refs/heads/trunk
Commit: dbf3e1c574d08dee0450feaf8cc7e0d4df0e0ba8
Parents: 8d993a4
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:45:45 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:45:45 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/AbstractRowResolver.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbf3e1c5/src/java/org/apache/cassandra/service/AbstractRowResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractRowResolver.java b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
index 1fbb92b..a84a6b6 100644
--- a/src/java/org/apache/cassandra/service/AbstractRowResolver.java
+++ b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
@@ -18,7 +18,9 @@
 package org.apache.cassandra.service;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.slf4j.Logger;
@@ -34,8 +36,8 @@ public abstract class AbstractRowResolver implements IResponseResolver<ReadRespo
     protected static final Logger logger = LoggerFactory.getLogger(AbstractRowResolver.class);
 
     protected final String keyspaceName;
-    // CLQ gives us thread-safety without the overhead of guaranteeing uniqueness like a Set would
-    protected final Collection<MessageIn<ReadResponse>> replies = new ConcurrentLinkedQueue<>();
+    // synchronizedList gives us thread-safety without the overhead of guaranteeing uniqueness like a Set would
+    protected final Collection<MessageIn<ReadResponse>> replies = Collections.synchronizedList(new ArrayList<MessageIn<ReadResponse>>());
     protected final DecoratedKey key;
 
     public AbstractRowResolver(ByteBuffer key, String keyspaceName)