[cxf] branch main updated: Revert "Fix ws-discovery-api test on MacOS on M1"

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
     new 853facf146 Revert "Fix ws-discovery-api test on MacOS on M1"
853facf146 is described below

commit 853facf1466661d74ccce985926063ed12d3a9d5
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Sep 27 16:12:50 2022 +0100

    Revert "Fix ws-discovery-api test on MacOS on M1"
    
    This reverts commit 2ce86e64d1ff695b93a958ec327c81c933b78565.
---
 .../java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
 
b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index 93a6b38c55..aa8f8684a9 100644
--- 
a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++ 
b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -84,6 +84,7 @@ public final class WSDiscoveryClientTest {
             System.out.println("Skipping MultiResponse test for REL");
             return;
         }
+
         Enumeration<NetworkInterface> interfaces = 
NetworkInterface.getNetworkInterfaces();
         int count = 0;
         if (interfaces != null) {
@@ -107,10 +108,8 @@ public final class WSDiscoveryClientTest {
                     //fake a discovery server to send back some canned 
messages.
                     InetAddress address = 
InetAddress.getByName("239.255.255.250");
                     MulticastSocket s = new 
MulticastSocket(Integer.parseInt(PORT));
-                    if (!"Mac OS 
X".equals(System.getProperties().getProperty("os.name"))) {
-                        s.setNetworkInterface(findIpv4Interface());
-                    }
                     s.setBroadcast(true);
+                    s.setNetworkInterface(findIpv4Interface());
                     s.setLoopbackMode(false);
                     s.setReuseAddress(true);
                     s.joinGroup(address);
@@ -121,7 +120,8 @@ public final class WSDiscoveryClientTest {
                     s.receive(p);
                     SocketAddress sa = p.getSocketAddress();
                     String incoming = new String(p.getData(), 0, 
p.getLength(), StandardCharsets.UTF_8);
-                    int idx = incoming.indexOf('>', 
incoming.indexOf("MessageID"));
+                    int idx = incoming.indexOf("MessageID");
+                    idx = incoming.indexOf('>', idx);
                     incoming = incoming.substring(idx + 1);
                     idx = incoming.indexOf("</");
                     incoming = incoming.substring(0, idx);