From 9da3a9f5348eec8d6a385312a4952db29caa0f47 Mon Sep 17 00:00:00 2001
From: Bela Ban <belaban@mailbox.org>
Date: Sat, 17 Jun 2023 16:21:38 +0200
Subject: [PATCH] ns

---
 src/org/jgroups/demos/RelayDemo.java          | 2 +-
 src/org/jgroups/protocols/relay/Topology.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/org/jgroups/demos/RelayDemo.java b/src/org/jgroups/demos/RelayDemo.java
index 3d56f1fed0..a8a4947e23 100644
--- a/src/org/jgroups/demos/RelayDemo.java
+++ b/src/org/jgroups/demos/RelayDemo.java
@@ -132,7 +132,7 @@ protected boolean process(String line) {
             return true;
         }
         if(line.equalsIgnoreCase("topo")) {
-            Topology topo=relay.topo().refresh();
+            Topology topo=relay.topo().removeAll(null).refresh();
             Util.sleep(100);
             System.out.printf("\n%s\n", topo.print());
             return true;
diff --git a/src/org/jgroups/protocols/relay/Topology.java b/src/org/jgroups/protocols/relay/Topology.java
index 7c0d86fe27..771670afe2 100644
--- a/src/org/jgroups/protocols/relay/Topology.java
+++ b/src/org/jgroups/protocols/relay/Topology.java
@@ -84,7 +84,10 @@ public String print(String site) {
     }
 
     public Topology removeAll(Collection<String> sites) {
-        cache.keySet().removeAll(sites);
+        if(sites == null)
+            cache.keySet().clear();
+        else
+            cache.keySet().removeAll(sites);
         return this;
     }