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:13:39 UTC
[cxf] branch 3.6.x-fixes updated (7157608c78 -> 8c3e3a0037)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 7157608c78 Recording .gitmergeinfo Changes
new d319f8a2f5 Recording .gitmergeinfo Changes
new 8c3e3a0037 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 | 1 +
.../java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java | 8 ++++----
2 files changed, 5 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d319f8a2f5ca93e7bcaa028f8026c402e1046037
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Sep 27 16:13:17 2022 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6c1ade61c9..4cab90b34a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -7,6 +7,7 @@ B 4b63dbb428488f3a6d0b7114632404b31458a521
B 79ee9824ee30b1b710d7385efc3cec736b4a5c54
B 7f4c668a04211e044c69fe51c0053567e39a13d6
B 7f683ba748e2133af0f93f1d77df5921b4e86011
+B 853facf1466661d74ccce985926063ed12d3a9d5
B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
B 9723e32190d3a820e0eecf19177561155399c867
B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
[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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8c3e3a003702fb9547519c0768806a7ce478dfa0
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Sep 27 16:13:31 2022 +0100
Revert "Fix ws-discovery-api test on MacOS on M1"
This reverts 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 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);