ns

belaban · Sep 18, 2009 · 6343597 · 6343597
1 parent a5befc7
commit 6343597
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/org/jgroups/protocols/pbcast/GmsImpl.java b/src/org/jgroups/protocols/pbcast/GmsImpl.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 @@ public static class Request {
         Address          mbr;
         boolean          suspected;
         Vector<Address>  coordinators;
-        View             view;
-        Digest           digest;
-        List<Address>    target_members;
 
         Request(int type) {
             this.type=type;

diff --git a/src/org/jgroups/util/TimeScheduler.java b/src/org/jgroups/util/TimeScheduler.java
@@ -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;
         }