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

[jbellis]

Author: jbellis
Date: Sat Dec  4 05:00:46 2010
New Revision: 1042100

URL: http://svn.apache.org/viewvc?rev=1042100&view=rev
Log:
fix botched merge of CASSANDRA-1316

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

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1042100&r1=1042099&r2=1042100&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Sat Dec  4 05:00:46 2010
@@ -31,7 +31,9 @@ dev
    immediately if insufficient live nodes exist (CASSANDRA-1803)
  * copy bytebuffers for local writes to avoid retaining the entire
    Thrift frame (CASSANDRA-1801)
+ * fix NPE adding index to column w/o prior metadata (CASSANDRA-1764)
  * reduce fat client timeout (CASSANDRA-1730)
+ * fix botched merge of CASSANDRA-1316
 
 
 0.7.0-rc1

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1042100&r1=1042099&r2=1042100&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
 Sat Dec  4 05:00:46 2010
@@ -369,7 +369,7 @@ public class StorageProxy implements Sto
             catch (DigestMismatchException ex)
             {
                 AbstractReplicationStrategy rs = 
Table.open(command.table).getReplicationStrategy();
-                QuorumResponseHandler<Row> handler = 
rs.getQuorumResponseHandler(new ReadResponseResolver(command.table), 
ConsistencyLevel.QUORUM);
+                QuorumResponseHandler<Row> handler = 
rs.getQuorumResponseHandler(new ReadResponseResolver(command.table), 
consistency_level);
                 if (logger.isDebugEnabled())
                     logger.debug("Digest mismatch:", ex);
                 Message messageRepair = command.makeReadMessage();