ns

belaban · Aug 9, 2019 · d68ac55 · d68ac55
1 parent 3703295
commit d68ac55
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/org/jgroups/demos/RelayDemo.java b/src/org/jgroups/demos/RelayDemo.java
@@ -5,9 +5,6 @@
 import org.jgroups.protocols.relay.RouteStatusListener;
 import org.jgroups.util.Util;
 
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 /** Demos RELAY. Create 2 *separate* clusters with RELAY as top protocol. Each RELAY has bridge_props="tcp.xml" (tcp.xml
  * needs to be present). Then start 2 instances in the first cluster and 2 instances in the second cluster. They should
  * find each other, and typing in a window should send the text to everyone, plus we should get 4 responses.
@@ -65,12 +62,12 @@ public void viewAccepted(View new_view) {
             relay.setRouteStatusListener(new RouteStatusListener() {
                 public void sitesUp(String... sites) {
                     System.out.printf("-- %s: site(s) %s came up\n",
-                                      ch.getAddress(), Stream.of(sites).collect(Collectors.joining(", ")));
+                                      ch.getAddress(), String.join(", ", sites));
                 }
 
                 public void sitesDown(String... sites) {
                     System.out.printf("-- %s: site(s) %s went down\n",
-                                      ch.getAddress(), Stream.of(sites).collect(Collectors.joining(", ")));
+                                      ch.getAddress(), String.join(", ", sites));
                 }
             });
         }

diff --git a/src/org/jgroups/protocols/relay/RELAY2.java b/src/org/jgroups/protocols/relay/RELAY2.java
@@ -384,7 +384,7 @@ public Object down(Event evt) {
 
     public Object down(Message msg) {
         Address dest=msg.getDest();
-        if(dest == null || !(dest instanceof SiteAddress))
+        if(!(dest instanceof SiteAddress))
             return down_prot.down(msg);
 
         SiteAddress target=(SiteAddress)dest;
@@ -445,9 +445,9 @@ public Object up(Message msg) {
             // forward a multicast message to all bridges except myself, then pass up
             if(dest == null && is_site_master && relay_multicasts && !msg.isFlagSet(Message.Flag.NO_RELAY)) {
                 Address src=msg.getSrc();
-                Address sender=new SiteUUID((UUID)msg.getSrc(), NameCache.get(msg.getSrc()), site);
+                SiteUUID sender=new SiteUUID((UUID)msg.getSrc(), NameCache.get(msg.getSrc()), site);
                 if(src instanceof ExtendedUUID)
-                    ((SiteUUID)sender).addContents((ExtendedUUID)src);
+                    sender.addContents((ExtendedUUID)src);
                 sendToBridges(sender, msg, site);
             }
             return up_prot.up(msg); // pass up
@@ -470,9 +470,9 @@ public void up(MessageBatch batch) {
                 // forward a multicast message to all bridges except myself, then pass up
                 if(dest == null && is_site_master && relay_multicasts && !msg.isFlagSet(Message.Flag.NO_RELAY)) {
                     Address src=msg.getSrc();
-                    Address sender=new SiteUUID((UUID)msg.getSrc(), NameCache.get(msg.getSrc()), site);
+                    SiteUUID sender=new SiteUUID((UUID)msg.getSrc(), NameCache.get(msg.getSrc()), site);
                     if(src instanceof ExtendedUUID)
-                        ((SiteUUID)sender).addContents((ExtendedUUID)src);
+                        sender.addContents((ExtendedUUID)src);
                     sendToBridges(sender, msg, site);
                 }
             }

diff --git a/src/org/jgroups/protocols/relay/Relayer.java b/src/org/jgroups/protocols/relay/Relayer.java
@@ -250,9 +250,9 @@ public void viewAccepted(View new_view) {
 
             if(listener != null) {
                 if(!down.isEmpty())
-                    listener.sitesDown(down.toArray(new String[down.size()]));
+                    listener.sitesDown(down.toArray(new String[0]));
                 if(!up.isEmpty())
-                    listener.sitesUp(up.toArray(new String[up.size()]));
+                    listener.sitesUp(up.toArray(new String[0]));
             }
         }