ns

belaban · Sep 14, 2009 · 6d647ac · 6d647ac
1 parent b1d9460
commit 6d647ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/org/jgroups/Global.java b/src/org/jgroups/Global.java
@@ -4,7 +4,7 @@
  * Globals used by JGroups packages.
  * 
  * @author Bela Ban Mar 29, 2004
- * @version $Id: Global.java,v 1.23.2.3 2008/06/02 14:56:23 belaban Exp $
+ * @version $Id: Global.java,v 1.23.2.4 2009/09/14 16:17:00 belaban Exp $
  */
 public class Global {
     /** Allows for conditional compilation; e.g., if(log.isTraceEnabled()) if(log.isInfoEnabled()) log.info(...) would be removed from the code
@@ -53,6 +53,7 @@ product should use if(log.isTraceEnabled()) rather than .
     public static final String MUX_MAX_THREADS="jgroups.mux.max_threads";
     public static final String MUX_KEEPALIVE="jgroups.mux.keepalive_time";
 
+    public static final long DEFAULT_FIRST_UNICAST_SEQNO=1;
 
     public static final String SINGLETON_NAME="singleton_name";
 

diff --git a/src/org/jgroups/protocols/UNICAST.java b/src/org/jgroups/protocols/UNICAST.java
@@ -15,8 +15,6 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
@@ -36,10 +34,10 @@
  * whenever a message is received: the new message is added and then we try to remove as many messages as
  * possible (until we stop at a gap, or there are no more messages).
  * @author Bela Ban
- * @version $Id: UNICAST.java,v 1.91.2.18 2009/09/11 14:13:38 belaban Exp $
+ * @version $Id: UNICAST.java,v 1.91.2.19 2009/09/14 16:17:17 belaban Exp $
  */
 public class UNICAST extends Protocol implements AckSenderWindow.RetransmitCommand, AgeOutCache.Handler<Address> {
-    private static final long DEFAULT_FIRST_SEQNO=1;
+    public static final long DEFAULT_FIRST_SEQNO=Global.DEFAULT_FIRST_UNICAST_SEQNO;
 
 
     /* ------------------------------------------ Properties  ------------------------------------------ */

diff --git a/tests/junit/org/jgroups/protocols/UNICAST_ContentionTest.java b/tests/junit/org/jgroups/protocols/UNICAST_ContentionTest.java
@@ -11,11 +11,11 @@
 /**
  * Tests for contention on UNICAST, measured by the number of retransmissions in UNICAST 
  * @author Bela Ban
- * @version $Id: UNICAST_ContentionTest.java,v 1.1.2.3 2009/09/14 14:04:02 belaban Exp $
+ * @version $Id: UNICAST_ContentionTest.java,v 1.1.2.4 2009/09/14 16:17:43 belaban Exp $
  */
 public class UNICAST_ContentionTest extends TestCase {
     JChannel c1, c2;
-    static final String props="SHARED_LOOPBACK(thread_pool.queue_max_size=5000);" +
+    static final String props="SHARED_LOOPBACK(thread_pool.queue_max_size=5000;" +
             "thread_pool.rejection_policy=discard;" +
             "oob_thread_pool.rejection_policy=discard)"+
             ":UNICAST(timeout=300,600,1200)";