From eff8c611575685b6df70eaf0e46639886c283ef9 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Fri, 4 Dec 2009 21:13:30 +0000
Subject: [PATCH] r/m unused HeartBeatState.heartbeat field.  patch by Jaakko
 Laine; reviewed by jbellis for CASSANDRA-597

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887359 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/cassandra/gms/Gossiper.java     |  2 +-
 .../apache/cassandra/gms/HeartBeatState.java   | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index f5d8d35659..1d266e59af 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -814,7 +814,7 @@ public class Gossiper implements IFailureDetectionEventListener, IEndPointStateC
         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);
diff --git a/src/java/org/apache/cassandra/gms/HeartBeatState.java b/src/java/org/apache/cassandra/gms/HeartBeatState.java
index 02b98080c3..92cc5460bf 100644
--- a/src/java/org/apache/cassandra/gms/HeartBeatState.java
+++ b/src/java/org/apache/cassandra/gms/HeartBeatState.java
@@ -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 @@ class HeartBeatState
     }
     
     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 @@ class HeartBeatState
         return generation_;
     }
 
-    int getHeartBeat()
-    {
-        return heartbeat_.get();
-    }
-    
     void updateHeartBeat()
     {
-        heartbeat_.incrementAndGet();      
         version_ = VersionGenerator.getNextVersion();
     }
     
@@ -87,12 +78,11 @@ class HeartBeatStateSerializer implements ICompactSerializer<HeartBeatState>
     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());
     }
 }