svn commit: r887359 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra/gms: Gossiper.java HeartBeatState.java

[jbellis]

Author: jbellis
Date: Fri Dec  4 21:13:30 2009
New Revision: 887359

URL: http://svn.apache.org/viewvc?rev=887359&view=rev
Log:
r/m unused HeartBeatState.heartbeat field.  patch by Jaakko Laine; reviewed by 
jbellis for CASSANDRA-597

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

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=887359&r1=887358&r2=887359&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java 
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java 
Fri Dec  4 21:13:30 2009
@@ -814,7 +814,7 @@
         EndPointState localState = endPointStateMap_.get(localEndPoint_);
         if ( localState == null )
         {
-            HeartBeatState hbState = new HeartBeatState(generationNbr, 0);
+            HeartBeatState hbState = new HeartBeatState(generationNbr);
             localState = new EndPointState(hbState);
             localState.isAlive(true);
             localState.isAGossiper(true);

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/HeartBeatState.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/HeartBeatState.java?rev=887359&r1=887358&r2=887359&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/HeartBeatState.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/HeartBeatState.java 
Fri Dec  4 21:13:30 2009
@@ -18,7 +18,6 @@
 
 package org.apache.cassandra.gms;
 
-import java.util.concurrent.atomic.AtomicInteger;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -40,18 +39,16 @@
     }
     
     int generation_;
-    AtomicInteger heartbeat_;
     int version_;
 
-    HeartBeatState(int generation, int heartbeat)
+    HeartBeatState(int generation)
     {
-        this(generation, heartbeat, 0);
+        this(generation, 0);
     }
     
-    HeartBeatState(int generation, int heartbeat, int version)
+    HeartBeatState(int generation, int version)
     {
         generation_ = generation;
-        heartbeat_ = new AtomicInteger(heartbeat);
         version_ = version;
     }
 
@@ -65,14 +62,8 @@
         return generation_;
     }
 
-    int getHeartBeat()
-    {
-        return heartbeat_.get();
-    }
-    
     void updateHeartBeat()
     {
-        heartbeat_.incrementAndGet();      
         version_ = VersionGenerator.getNextVersion();
     }
     
@@ -87,12 +78,11 @@
     public void serialize(HeartBeatState hbState, DataOutputStream dos) throws 
IOException
     {
         dos.writeInt(hbState.generation_);
-        dos.writeInt(hbState.heartbeat_.get());
         dos.writeInt(hbState.version_);
     }
     
     public HeartBeatState deserialize(DataInputStream dis) throws IOException
     {
-        return new HeartBeatState(dis.readInt(), dis.readInt(), dis.readInt());
+        return new HeartBeatState(dis.readInt(), dis.readInt());
     }
 }