summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/ObjectAdapterI.java18
-rw-r--r--java/src/IceInternal/TcpAcceptor.java25
-rw-r--r--java/src/IceInternal/UdpTransceiver.java27
-rw-r--r--java/src/IceSSL/AcceptorI.java25
-rw-r--r--java/src/IceUtilInternal/StringUtil.java20
5 files changed, 45 insertions, 70 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 7478f6ffb5d..0737878ca27 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1209,26 +1209,16 @@ public final class ObjectAdapterI implements ObjectAdapter
{
//
// If the PublishedEndpoints property isn't set, we compute the published enpdoints
- // from the OA endpoints.
+ // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY
+ // to include actual addresses in the published endpoints.
//
for(IceInternal.IncomingConnectionFactory factory : _incomingConnectionFactories)
{
- endpoints.add(factory.endpoint());
+ endpoints.addAll(factory.endpoint().expand());
}
-
- //
- // Expand any endpoints that may be listening on INADDR_ANY to
- // include actual addresses in the published endpoints.
- //
- java.util.List<IceInternal.EndpointI> expandedEndpoints = new java.util.ArrayList<IceInternal.EndpointI>();
- for(IceInternal.EndpointI p : endpoints)
- {
- expandedEndpoints.addAll(p.expand());
- }
- endpoints = expandedEndpoints;
}
- if(_instance.traceLevels().network >= 3)
+ if(_instance.traceLevels().network >= 1)
{
StringBuffer s = new StringBuffer("published endpoints for object adapter `");
s.append(_name);
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 1ecd024c3c9..50f46759f6f 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -40,25 +40,14 @@ class TcpAcceptor implements Acceptor
{
StringBuffer s = new StringBuffer("accepting tcp connections at ");
s.append(toString());
- if(_traceLevels.network >= 3)
+
+ java.util.List<String> interfaces =
+ Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), _instance.protocolSupport(),
+ true);
+ if(!interfaces.isEmpty())
{
- java.util.List<String> interfaces =
- Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(),
- _instance.protocolSupport(), true);
- if(!interfaces.isEmpty())
- {
- s.append("\nlocal interfaces: ");
- boolean first = true;
- for(String iface : interfaces)
- {
- if(!first)
- {
- s.append(", ");
- }
- s.append(iface);
- first = false;
- }
- }
+ s.append("\nlocal interfaces: ");
+ s.append(IceUtilInternal.StringUtil.joinString(interfaces, ", "));
}
_logger.trace(_traceLevels.networkCat, s.toString());
}
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 49146a1383a..70533314e95 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -257,7 +257,6 @@ final class UdpTransceiver implements Transceiver
_traceLevels = instance.traceLevels();
_logger = instance.initializationData().logger;
_stats = instance.initializationData().stats;
- _protocolSupport = instance.protocolSupport();
_connect = true;
_warn = instance.initializationData().properties.getPropertyAsInt("Ice.Warn.Datagrams") > 0;
_addr = addr;
@@ -295,7 +294,6 @@ final class UdpTransceiver implements Transceiver
_traceLevels = instance.traceLevels();
_logger = instance.initializationData().logger;
_stats = instance.initializationData().stats;
- _protocolSupport = instance.protocolSupport();
_connect = connect;
_warn = instance.initializationData().properties.getPropertyAsInt("Ice.Warn.Datagrams") > 0;
@@ -347,24 +345,14 @@ final class UdpTransceiver implements Transceiver
{
StringBuffer s = new StringBuffer("starting to receive udp packets\n");
s.append(toString());
- if(_traceLevels.network >= 3)
+
+ java.util.List<String> interfaces =
+ Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), instance.protocolSupport(),
+ true);
+ if(!interfaces.isEmpty())
{
- java.util.List<String> interfaces =
- Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), _protocolSupport, true);
- if(!interfaces.isEmpty())
- {
- s.append("\nlocal interfaces: ");
- boolean first = true;
- for(String iface : interfaces)
- {
- if(!first)
- {
- s.append(", ");
- }
- s.append(iface);
- first = false;
- }
- }
+ s.append("\nlocal interfaces: ");
+ s.append(IceUtilInternal.StringUtil.joinString(interfaces, ", "));
}
_logger.trace(_traceLevels.networkCat, s.toString());
}
@@ -550,7 +538,6 @@ final class UdpTransceiver implements Transceiver
private TraceLevels _traceLevels;
private Ice.Logger _logger;
private Ice.Stats _stats;
- private int _protocolSupport;
private boolean _connect;
private final boolean _warn;
private int _rcvSize;
diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java
index a422f97a4df..18184b50aa2 100644
--- a/java/src/IceSSL/AcceptorI.java
+++ b/java/src/IceSSL/AcceptorI.java
@@ -40,25 +40,14 @@ final class AcceptorI implements IceInternal.Acceptor
{
StringBuffer s = new StringBuffer("accepting ssl connections at ");
s.append(toString());
- if(_instance.networkTraceLevel() >= 3)
+
+ java.util.List<String> interfaces =
+ IceInternal.Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(),
+ _instance.protocolSupport(), true);
+ if(!interfaces.isEmpty())
{
- java.util.List<String> interfaces =
- IceInternal.Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(),
- _instance.protocolSupport(), true);
- if(!interfaces.isEmpty())
- {
- s.append("\nlocal interfaces: ");
- boolean first = true;
- for(String iface : interfaces)
- {
- if(!first)
- {
- s.append(", ");
- }
- s.append(iface);
- first = false;
- }
- }
+ s.append("\nlocal interfaces: ");
+ s.append(IceUtilInternal.StringUtil.joinString(interfaces, ", "));
}
_logger.trace(_instance.networkTraceCategory(), s.toString());
}
diff --git a/java/src/IceUtilInternal/StringUtil.java b/java/src/IceUtilInternal/StringUtil.java
index 9ff9d80cfd2..befc624f425 100644
--- a/java/src/IceUtilInternal/StringUtil.java
+++ b/java/src/IceUtilInternal/StringUtil.java
@@ -363,6 +363,26 @@ public final class StringUtil
}
}
+ //
+ // Join a list of strings using the given delimiter.
+ //
+ public static String
+ joinString(java.util.List<String> values, String delimiter)
+ {
+ StringBuffer s = new StringBuffer();
+ boolean first = true;
+ for(String v : values)
+ {
+ if(!first)
+ {
+ s.append(delimiter);
+ }
+ s.append(v);
+ first = false;
+ }
+ return s.toString();
+ }
+
public static int
checkQuote(String s)
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 14:53:14 +0000