ns

belaban · Dec 19, 2024 · f463861 · f463861
1 parent 6e0bb6a
commit f463861
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/org/jgroups/util/LazyThreadFactory.java b/src/org/jgroups/util/LazyThreadFactory.java
@@ -78,6 +78,10 @@ protected void renameThreads() {
         for(Iterator<WeakReference<Thread>> it=threads.iterator(); it.hasNext();) {
             WeakReference<Thread> ref=it.next();
             Thread thread=ref.get();
+            if(thread == null) {
+                it.remove();
+                continue;
+            }
             String name=thread.getName();
             name=changeName(name);
             thread.setName(name);

diff --git a/tests/junit-functional/org/jgroups/protocols/UNICAST_RetransmitTest.java b/tests/junit-functional/org/jgroups/protocols/UNICAST_RetransmitTest.java
@@ -73,7 +73,7 @@ public void testLargeRetransmission(Class<? extends Protocol> unicast_class) thr
         startRetransmission(a, b);
         setLevel("trace", a,b);
 
-        Util.waitUntilListHasSize(list, NUM_MSGS, 10000, 1000);
+        Util.waitUntilListHasSize(list, NUM_MSGS, 15000, 1000);
         int expected=1;
         for(int num: list) {
             assert expected == num;

diff --git a/tests/junit-functional/org/jgroups/tests/ConcurrentConnectTest.java b/tests/junit-functional/org/jgroups/tests/ConcurrentConnectTest.java
@@ -70,7 +70,7 @@ public void testConcurrentConnect() throws Exception {
             a.send(addr_b, String.format("%s%d", addr_a, i));
         for(int i=1; i <= NUM; i++)
             b.send(addr_a, String.format("%s%d", addr_b, i));
-        Util.waitUntil(5000, 100, () -> la.size() == 5 && lb.size() == 5,
+        Util.waitUntil(10000, 100, () -> la.size() == 5 && lb.size() == 5,
                        () -> String.format("A: %s, B: %s", la, lb));
         System.out.printf("### conns after sending:\n%s\n", printConnections(a,b));