Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cassandra.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1067528 -
 /cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
Date: Sat, 05 Feb 2011 21:27:54 -0000
To: commits@cassandra.apache.org
From: brandonwilliams@apache.org
Message-Id: <20110205212754.87C58238896F@eris.apache.org>

Author: brandonwilliams
Date: Sat Feb  5 21:27:54 2011
New Revision: 1067528

URL: http://svn.apache.org/viewvc?rev=1067528&view=rev
Log:
fix merge from 2072

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1067528&r1=1067527&r2=1067528&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Sat Feb  5 21:27:54 2011
@@ -430,9 +430,11 @@ public class Gossiper implements IFailur
                         epState.setHasToken(true);
                     else
                     {
-                        logger.info("FatClient " + endpoint + " has been silent for " + FatClientTimeout + "ms, removing from gossip");
                         if (!justRemovedEndpoints.containsKey(endpoint)) // if the node was decommissioned, it will have been removed but still appear as a fat client
+                        {
+                            logger.info("FatClient " + endpoint + " has been silent for " + FatClientTimeout + "ms, removing from gossip");
                             removeEndpoint(endpoint); // after quarantine justRemoveEndpoints will remove the state
+                        }
                     }
                 }