[cxf] 01/04: Fix ws-discovery-api test on MacOS on M1

[dkulp]

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

dkulp pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 0a6d9ccffea358ba69aceef43fd10255ab86b5c2
Author: Daniel Kulp <d...@kulp.com>
AuthorDate: Wed Jun 22 12:14:14 2022 -0400

    Fix ws-discovery-api test on MacOS on M1
    
    (cherry picked from commit 50679288e5b8ae75e90ce6d888018a08ad7cd36f)
---
 .../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 b8a313802c..836f72bc7c 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
@@ -85,7 +85,6 @@ public final class WSDiscoveryClientTest {
             System.out.println("Skipping MultiResponse test for REL");
             return;
         }
-
         Enumeration<NetworkInterface> interfaces = 
NetworkInterface.getNetworkInterfaces();
         int count = 0;
         if (interfaces != null) {
@@ -109,8 +108,10 @@ 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,8 +122,7 @@ 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("MessageID");
-                    idx = incoming.indexOf('>', idx);
+                    int idx = incoming.indexOf('>', 
incoming.indexOf("MessageID"));
                     incoming = incoming.substring(idx + 1);
                     idx = incoming.indexOf("</");
                     incoming = incoming.substring(0, idx);