Author: brandonwilliams Date: Sat Feb 5 20:35:40 2011 New Revision: 1067516
URL: http://svn.apache.org/viewvc?rev=1067516&view=rev Log: Fix more merge breakage 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=1067516&r1=1067515&r2=1067516&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 20:35:40 2011 @@ -676,9 +676,9 @@ public class Gossiper implements IFailur int oldVersion = localState.getHeartBeatState().getHeartBeatVersion(); Map<ApplicationState, VersionedValue> localAppStateMap = localState.getApplicationStateMap(); - localState.setHeartBeatState(remoteHbState); + localState.setHeartBeatState(remoteState.getHeartBeatState()); if (logger.isTraceEnabled()) - logger.trace("Updating heartbeat state generation to " + remoteHbState.getGeneration() + " from " + localHbState.getGeneration() + " for " + addr); + logger.trace("Updating heartbeat state version to " + localState.getHeartBeatState().getHeartBeatVersion() + " from " + oldVersion + " for " + addr + " ..."); for (Entry<ApplicationState, VersionedValue> remoteEntry : remoteState.getApplicationStateMap().entrySet()) {
