svn commit: r1030448 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java

[gdusbabek]

Author: gdusbabek
Date: Wed Nov  3 13:08:22 2010
New Revision: 1030448

URL: http://svn.apache.org/viewvc?rev=1030448&view=rev
Log:
fix move breakage in 2 node clusters. patch by gdusbabek, reviewed by jbellis. 
CASSANDRA-1670

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1030448&r1=1030447&r2=1030448&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
 Wed Nov  3 13:08:22 2010
@@ -416,18 +416,18 @@ public class Gossiper implements IFailur
                     evictFromMembership(endpoint);
                 }
             }
-
-            if (!justRemovedEndpoints_.isEmpty())
+        }
+        
+        if (!justRemovedEndpoints_.isEmpty())
+        {
+            Hashtable<InetAddress, Long> copy = new Hashtable<InetAddress, 
Long>(justRemovedEndpoints_);
+            for (Map.Entry<InetAddress, Long> entry : copy.entrySet())
             {
-                Hashtable<InetAddress, Long> copy = new Hashtable<InetAddress, 
Long>(justRemovedEndpoints_);
-                for (Map.Entry<InetAddress, Long> entry : copy.entrySet())
+                if ((now - entry.getValue()) > StorageService.RING_DELAY)
                 {
-                    if ((now - entry.getValue()) > StorageService.RING_DELAY)
-                    {
-                        if (logger_.isDebugEnabled())
-                            logger_.debug(StorageService.RING_DELAY + " 
elapsed, " + entry.getKey() + " gossip quarantine over");
-                        justRemovedEndpoints_.remove(entry.getKey());
-                    }
+                    if (logger_.isDebugEnabled())
+                        logger_.debug(StorageService.RING_DELAY + " elapsed, " 
+ entry.getKey() + " gossip quarantine over");
+                    justRemovedEndpoints_.remove(entry.getKey());
                 }
             }
         }