Permalink
Browse files

ns

  • Loading branch information...
Bela Ban
Bela Ban committed Sep 18, 2009
1 parent a5befc7 commit 634359705aae057cf7d52deab7108886bad08939
Showing with 8 additions and 7 deletions.
  1. +1 −5 src/org/jgroups/protocols/pbcast/GmsImpl.java
  2. +7 −2 src/org/jgroups/util/TimeScheduler.java
@@ -1,4 +1,4 @@
-// $Id: GmsImpl.java,v 1.28.2.2 2009/09/08 12:25:03 belaban Exp $
+// $Id: GmsImpl.java,v 1.28.2.3 2009/09/18 10:53:28 belaban Exp $
package org.jgroups.protocols.pbcast;
@@ -8,7 +8,6 @@
import java.util.Collection;
import java.util.Vector;
-import java.util.List;
public abstract class GmsImpl {
@@ -103,9 +102,6 @@ protected boolean iWouldBeCoordinator(Vector new_mbrs) {
Address mbr;
boolean suspected;
Vector<Address> coordinators;
- View view;
- Digest digest;
- List<Address> target_members;
Request(int type) {
this.type=type;
@@ -39,7 +39,7 @@
* added tasks will not restart it: <tt>start()</tt> has to be called to
* restart the scheduler.
* @author Bela Ban
- * @version $Id: TimeScheduler.java,v 1.23.4.6 2009/09/11 11:33:46 belaban Exp $
+ * @version $Id: TimeScheduler.java,v 1.23.4.7 2009/09/18 10:53:56 belaban Exp $
*/
public class TimeScheduler extends ScheduledThreadPoolExecutor implements ThreadManager {
@@ -252,7 +252,12 @@ public int compareTo(Delayed o) {
return my_delay < their_delay? -1 : my_delay > their_delay? 1 : 0;
}
- public long getDelay(TimeUnit unit) {
+ public boolean equals(Object obj) {
+ Delayed other=(Delayed)obj;
+ return compareTo(other) == 0;
+ }
+
+ public long getDelay(TimeUnit unit) {
return future != null? future.getDelay(unit) : -1;
}

0 comments on commit 6343597

Please sign in to comment.