reset callbacks map in MS.listen to allow RemoveTest to restart it

jairamc · Jan 12, 2012 · 1e75013 · 1e75013
1 parent 452ddf6
commit 1e75013
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -228,6 +228,7 @@ public void convict(InetAddress ep)
      */
     public void listen(InetAddress localEp) throws IOException, ConfigurationException
     {
+        callbacks.reset(); // hack to allow tests to stop/restart MS
         for (ServerSocket ss: getServerSocket(localEp))
         {
             SocketThread th = new SocketThread(ss, "ACCEPT-" + localEp);
@@ -471,7 +472,7 @@ public void waitForStreaming() throws InterruptedException
 
     public void clearCallbacksUnsafe()
     {
-        callbacks.clear();
+        callbacks.reset();
     }
 
     /**
@@ -496,7 +497,6 @@ public void shutdown()
         {
             throw new IOError(e);
         }
-
     }
 
     public void receive(Message message, String id)

diff --git a/src/java/org/apache/cassandra/utils/ExpiringMap.java b/src/java/org/apache/cassandra/utils/ExpiringMap.java
@@ -121,8 +121,9 @@ public void shutdown()
         timer.cancel();
     }
 
-    public void clear()
+    public void reset()
     {
+        shutdown = false;
         cache.clear();
     }