svn commit: r1166716 - in /cassandra/trunk: CHANGES.txt src/java/org/apache/cassandra/service/StorageProxy.java

[slebresne]

Author: slebresne
Date: Thu Sep  8 14:36:53 2011
New Revision: 1166716

URL: http://svn.apache.org/viewvc?rev=1166716&view=rev
Log:
After a "short read", the wrong read command may be used
patch by slebresne; reviewed by jbellis for CASSANDRA-3157

Modified:
    cassandra/trunk/CHANGES.txt
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1166716&r1=1166715&r2=1166716&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Sep  8 14:36:53 2011
@@ -24,7 +24,7 @@
  * use lazy initialization instead of class initialization in NodeId
    (CASSANDRA-2953)
  * add paging to get_count (CASSANDRA-2894)
- * fix "short reads" in [multi]get (CASSANDRA-2643)
+ * fix "short reads" in [multi]get (CASSANDRA-2643, 3157)
  * add optional compression for sstables (CASSANDRA-47, 3001, 3128)
  * add scheduler JMX metrics (CASSANDRA-2962)
  * add block level checksum for compressed data (CASSANDRA-1717)

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1166716&r1=1166715&r2=1166716&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Thu 
Sep  8 14:36:53 2011
@@ -652,7 +652,7 @@ public class StorageProxy implements Sto
             {
                 ReadCallback<Row> handler = readCallbacks.get(i);
                 Row row;
-                ReadCommand command = commands.get(i);
+                ReadCommand command = commandsToSend.get(i);
                 try
                 {
                     long startTime2 = System.currentTimeMillis();