svn commit: r1057965 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra: net/MessagingService.java service/ReadCallback.java

[jbellis]

Author: jbellis
Date: Wed Jan 12 01:01:04 2011
New Revision: 1057965

URL: http://svn.apache.org/viewvc?rev=1057965&view=rev
Log:
r/m unused code and invalid TODO

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadCallback.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java?rev=1057965&r1=1057964&r2=1057965&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/MessagingService.java
 Wed Jan 12 01:01:04 2011
@@ -444,7 +444,7 @@ public final class MessagingService impl
     
     public IMessageCallback removeRegisteredCallback(String messageId)
     {
-        targets.remove(messageId); // TODO fix this when we clean up quorum 
reads to do proper RR
+        targets.remove(messageId);
         return callbacks.remove(messageId);
     }
 

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadCallback.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadCallback.java?rev=1057965&r1=1057964&r2=1057965&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadCallback.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadCallback.java
 Wed Jan 12 01:01:04 2011
@@ -81,15 +81,6 @@ public class ReadCallback<T> implements 
         return blockfor == 1 ? resolver.getData() : resolver.resolve();
     }
 
-    public void close()
-    {
-        MessagingService ms = MessagingService.instance();
-        for (Message response : resolver.getMessages())
-        {
-            ms.removeRegisteredCallback(response.getMessageId());
-        }
-    }
-    
     public void response(Message message)
     {
         resolver.preprocess(message);