Minimum Java version now 17 - remove unnecessary code

1210xx · Feb 16, 2023 · 2f94c7b · 2f94c7b
1 parent 3f7dafd
commit 2f94c7b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 121 deletions.
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -25,6 +25,7 @@
 import java.net.MulticastSocket;
 import java.net.NetworkInterface;
 import java.net.SocketTimeoutException;
+import java.net.StandardSocketOptions;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -34,7 +35,6 @@
 import org.apache.catalina.tribes.MessageListener;
 import org.apache.catalina.tribes.io.ChannelData;
 import org.apache.catalina.tribes.io.XByteBuffer;
-import org.apache.catalina.tribes.util.JreCompat;
 import org.apache.catalina.tribes.util.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -220,7 +220,7 @@ protected void setupSocket() throws IOException {
             socket = new MulticastSocket(port);
         }
         // Hint if we want disable loop back(local machine) messages
-        JreCompat.getInstance().setSocketoptionIpMulticastLoop(socket, !localLoopbackDisabled);
+        socket.setOption(StandardSocketOptions.IP_MULTICAST_LOOP, Boolean.valueOf(!localLoopbackDisabled));
         if (mcastBindAddress != null) {
             if(log.isInfoEnabled()) {
                 log.info(sm.getString("mcastServiceImpl.setInterface", mcastBindAddress));

diff --git a/java/org/apache/catalina/tribes/util/Jre14Compat.java b/java/org/apache/catalina/tribes/util/Jre14Compat.java
diff --git a/java/org/apache/catalina/tribes/util/JreCompat.java b/java/org/apache/catalina/tribes/util/JreCompat.java
diff --git a/test/org/apache/catalina/tribes/TesterMulticast.java b/test/org/apache/catalina/tribes/TesterMulticast.java
@@ -20,10 +20,9 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
+import java.net.StandardSocketOptions;
 import java.net.UnknownHostException;
 
-import org.apache.catalina.tribes.util.JreCompat;
-
 /**
  * A simple multicast test that replicates the core elements of Tomcat's
  * multicast membership. If this works then multicast membership should work.
@@ -83,7 +82,7 @@ private static class Rx implements Runnable {
         @Override
         public void run() {
             try (MulticastSocket s = new MulticastSocket(PORT)) {
-                JreCompat.getInstance().setSocketoptionIpMulticastLoop(s, true);
+                s.setOption(StandardSocketOptions.IP_MULTICAST_LOOP, Boolean.valueOf(true));
                 s.joinGroup(new InetSocketAddress(INET_ADDRESS, 0), null);
                 DatagramPacket p = new DatagramPacket(new byte[4], 4);
                 p.setAddress(INET_ADDRESS);
@@ -110,7 +109,7 @@ private static class Tx implements Runnable {
         @Override
         public void run() {
             try (MulticastSocket s = new MulticastSocket(PORT)) {
-                JreCompat.getInstance().setSocketoptionIpMulticastLoop(s, true);
+                s.setOption(StandardSocketOptions.IP_MULTICAST_LOOP, Boolean.valueOf(true));
                 s.joinGroup(new InetSocketAddress(INET_ADDRESS, 0), null);
                 DatagramPacket p = new DatagramPacket(new byte[4], 4);
                 p.setAddress(INET_ADDRESS);