You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2022/09/27 15:14:46 UTC
[cxf] branch 3.4.x-fixes updated (732c4c1e41 -> 7a27a29fe8)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 732c4c1e41 Fixed resource folder location (cxf-rt-rs-http-sci)
new ee1efa7660 Recording .gitmergeinfo Changes
new 7a27a29fe8 Revert "Fix ws-discovery-api test on MacOS on M1"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
.../java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
[cxf] 01/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ee1efa7660c38ff21f7448787c460ca53ca2aea2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Sep 27 16:14:27 2022 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cccbc53b37..bd9c59e2c0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -26,6 +26,7 @@ B 1b5c307b2f4cb375f436c9c1f406e099a15ef317
B 1b6adcb32f93d708d817cabf2cc63973fbc069de
B 1cb2a5fe44e390cf2106b07d8b6a8b5fffcda3e7
B 1cc69bd3ae56bcb514d706d876f9b97135253d34
+B 237c71cbdc26cbc6e346c8cc592bd17ac892910e
B 24cdfa9312f878a14ad1ac19b4c9750ae3d8e60e
B 25ba7358dd56f2827bc2f48098d4e315e6f1baea
B 2634ed5bcfb6001c1a72788a1152bedc6315585e
@@ -165,6 +166,7 @@ B df1c14e0f6d2246177c9f01762e19107e79c4393
B df47e19340ab59dd9eaebac340d89f18e44ef134
B dfbc4575f45fb22d4a7417914f87ea585e64d6b1
B e441840c0212b8559ad406595fa4174a29124652
+B e713fd34837af629711a16a7e376b0a090a393c7
B e7f7b2154ed9f5668a62a7e99f862ca1aef7cd43
B e85178929cac18f07e72b67bbc17ec34f0a517a6
B ebcb82036cd653ff1c29abff2da57c8af8fb53f8
[cxf] 02/02: Revert "Fix ws-discovery-api test on MacOS on M1"
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7a27a29fe884ea1ccae79022f95c0bcbf88f8cda
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Sep 27 16:14:36 2022 +0100
Revert "Fix ws-discovery-api test on MacOS on M1"
This reverts commit 6b7c35a538d3e15ea7ce2bf8b623105801ae9ba4.
---
.../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 836f72bc7c..b8a313802c 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,6 +85,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) {
@@ -108,10 +109,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);
@@ -122,7 +121,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);