Author: jbellis
Date: Fri Jun 26 17:38:22 2009
New Revision: 788781
URL: http://svn.apache.org/viewvc?rev=788781&view=rev
Log:
r/m refactor from CASSANDRA-249 that caused infinite recursion. patch by
jbellis
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/HeartBeatState.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java?rev=788781&r1=788780&r2=788781&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
Fri Jun 26 17:38:22 2009
@@ -57,8 +57,6 @@
/* The time when the module was instantiated. */
private static long creationTime_;
- private Gossiper gossiper;
-
public static IFailureDetector instance()
{
if ( failureDetector_ == null )
@@ -68,7 +66,7 @@
{
if ( failureDetector_ == null )
{
- failureDetector_ = new
FailureDetector(Gossiper.instance());
+ failureDetector_ = new FailureDetector();
}
}
finally
@@ -82,9 +80,8 @@
private Map<EndPoint, ArrivalWindow> arrivalSamples_ = new
Hashtable<EndPoint, ArrivalWindow>();
private List<IFailureDetectionEventListener> fdEvntListeners_ = new
ArrayList<IFailureDetectionEventListener>();
- public FailureDetector(Gossiper gossiper)
+ public FailureDetector()
{
- this.gossiper = gossiper;
creationTime_ = System.currentTimeMillis();
// Register this instance with JMX
try
@@ -241,7 +238,7 @@
private static Logger logger_ = Logger.getLogger(ArrivalWindow.class);
private double tLast_ = 0L;
private BoundedStatsDeque arrivalIntervals_;
-
+
ArrivalWindow(int size)
{
arrivalIntervals_ = new BoundedStatsDeque(size);
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=788781&r1=788780&r2=788781&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 Jun 26 17:38:22 2009
@@ -91,7 +91,6 @@
{
return version_;
}
-
};
class HeartBeatStateSerializer implements ICompactSerializer<HeartBeatState>
