svn commit: r908561 - /incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java

[jbellis]

Author: jbellis
Date: Wed Feb 10 16:08:31 2010
New Revision: 908561

URL: http://svn.apache.org/viewvc?rev=908561&view=rev
Log:
fix timeout bug.  patch by jbellis; tested by Jack Culpepper for CASSANDRA-781

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

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=908561&r1=908560&r2=908561&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
 Wed Feb 10 16:08:31 2010
@@ -564,13 +564,12 @@
                 Message message = c2.getMessage();
 
                 // collect replies and resolve according to consistency level
-                RangeSliceResponseResolver resolver = new 
RangeSliceResponseResolver(command.keyspace, currentRange, endpoints);
+                List<InetAddress> endpointsforCL = endpoints.subList(0, 
responseCount);
+                RangeSliceResponseResolver resolver = new 
RangeSliceResponseResolver(command.keyspace, currentRange, endpointsforCL);
                 QuorumResponseHandler<Map<String, ColumnFamily>> handler = new 
QuorumResponseHandler<Map<String, ColumnFamily>>(responseCount, resolver);
 
-                Iterator<InetAddress> endpointIter = endpoints.iterator();
-                for (int i = 0; i < responseCount; i++)
+                for (InetAddress endpoint : endpointsforCL)
                 {
-                    InetAddress endpoint = endpointIter.next();
                     MessagingService.instance.sendRR(message, endpoint, 
handler);
                     if (logger.isDebugEnabled())
                         logger.debug("reading " + c2 + " for " + range + " 
from " + message.getMessageId() + "@" + endpoint);