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

[jb...@apache.org]

Author: jbellis
Date: Fri Aug 14 20:20:50 2009
New Revision: 804359

URL: http://svn.apache.org/viewvc?rev=804359&view=rev
Log:
rename dispatchMessage overload w/ identical erased signature to make JDK7 (and the Java spec) happy.  patch by Michael Greene; reviewed by jbellis for CASSNADRA-366

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=804359&r1=804358&r2=804359&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 Fri Aug 14 20:20:50 2009
@@ -481,7 +481,7 @@
         return messages;
     }
     
-    private static MultiQuorumResponseHandler dispatchMessages(Map<String, ReadCommand[]> readMessages, Map<String, Message[]> messages) throws IOException
+    private static MultiQuorumResponseHandler dispatchMessagesMulti(Map<String, ReadCommand[]> readMessages, Map<String, Message[]> messages) throws IOException
     {
         Set<String> keys = messages.keySet();
         /* This maps the keys to the original data read messages */
@@ -541,7 +541,7 @@
         /* Construct the messages to be sent to the replicas */
         Map<String, Message[]> replicaMessages = constructReplicaMessages(readMessages);
         /* Dispatch the messages to the different replicas */
-        MultiQuorumResponseHandler cb = dispatchMessages(readMessages, replicaMessages);
+        MultiQuorumResponseHandler cb = dispatchMessagesMulti(readMessages, replicaMessages);
         try
         {
             Row[] rows2 = cb.get();