svn commit: r1030282 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java

[jbellis]

Author: jbellis
Date: Tue Nov  2 23:24:10 2010
New Revision: 1030282

URL: http://svn.apache.org/viewvc?rev=1030282&view=rev
Log:
revert gossiper change out of last

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

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1030282&r1=1030281&r2=1030282&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
 Tue Nov  2 23:24:10 2010
@@ -414,18 +414,18 @@ public class Gossiper implements IFailur
                     evictFromMembership(endpoint);
                 }
             }
-        }
-        
-        if (!justRemovedEndPoints_.isEmpty())
-        {
-            Hashtable<InetAddress, Long> copy = new Hashtable<InetAddress, 
Long>(justRemovedEndPoints_);
-            for (Map.Entry<InetAddress, Long> entry : copy.entrySet())
+
+            if (!justRemovedEndPoints_.isEmpty())
             {
-                if ((now - entry.getValue()) > StorageService.RING_DELAY)
+                Hashtable<InetAddress, Long> copy = new Hashtable<InetAddress, 
Long>(justRemovedEndPoints_);
+                for (Map.Entry<InetAddress, Long> entry : copy.entrySet())
                 {
-                    if (logger_.isDebugEnabled())
-                        logger_.debug(StorageService.RING_DELAY + " elapsed, " 
+ entry.getKey() + " gossip quarantine over");
-                    justRemovedEndPoints_.remove(entry.getKey());
+                    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());
+                    }
                 }
             }
         }