svn commit: r1066843 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/service/StorageProxy.java

[jb...@apache.org]

Author: jbellis
Date: Thu Feb  3 15:57:49 2011
New Revision: 1066843

URL: http://svn.apache.org/viewvc?rev=1066843&view=rev
Log:
fix range slice ConsistencyLevel > ONE
patch by jbellis; tested by Michel Conrad and Thibaut for CASSANDRA-2081

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1066843&r1=1066842&r2=1066843&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Thu Feb  3 15:57:49 2011
@@ -1,5 +1,6 @@
 0.6.12
  * include digest responses in dynamic snitch latencies (CASSANDRA-2085)
+ * fix range slice ConsistencyLevel > ONE (CASSANDRA-2081)
 
 
 0.6.11

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1066843&r1=1066842&r2=1066843&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java Thu Feb  3 15:57:49 2011
@@ -555,7 +555,6 @@ public class StorageProxy implements Sto
             List<InetAddress> endpoints = liveEndpoints.subList(0, responseCount);
 
             RangeSliceCommand c2 = new RangeSliceCommand(command.keyspace, command.column_family, command.super_column, command.predicate, range, command.max_keys);
-            Message message = c2.getMessage();
 
             // collect replies and resolve according to consistency level
             RangeSliceResponseResolver resolver = new RangeSliceResponseResolver(command.keyspace, endpoints, StorageService.getPartitioner());
@@ -563,6 +562,7 @@ public class StorageProxy implements Sto
 
             for (InetAddress endpoint : endpoints)
             {
+                Message message = c2.getMessage();
                 MessagingService.instance.sendRR(message, endpoint, handler);
                 if (logger.isDebugEnabled())
                     logger.debug("reading " + c2 + " from " + message.getMessageId() + "@" + endpoint);