summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/TcpEndpointI.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-02-11 16:07:16 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-02-11 16:07:16 +0100
commit0a52973ce569827357cfa9ac0a2e96c09ffbf7cc (patch)
treef219b25bebeca4f1e9e58e7174fe7870675b6246 /java/src/IceInternal/TcpEndpointI.java
parentAdd Makefile.mak rule to register assemblies in source dir. (diff)
downloadice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.bz2
ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.xz
ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.zip
Fixed ICE-5215: IPv6 support enabled by default
Diffstat (limited to 'java/src/IceInternal/TcpEndpointI.java')
-rw-r--r--java/src/IceInternal/TcpEndpointI.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index 64a4a4822f7..74f46099677 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -390,15 +390,16 @@ final class TcpEndpointI extends EndpointI
// is available.
//
public java.util.List<Connector>
- connectors()
+ connectors(Ice.EndpointSelectionType selType)
{
- return connectors(Network.getAddresses(_host, _port, _instance.protocolSupport()));
+ return connectors(Network.getAddresses(_host, _port, _instance.protocolSupport(), selType,
+ _instance.preferIPv6()));
}
public void
- connectors_async(EndpointI_connectors callback)
+ connectors_async(Ice.EndpointSelectionType selType, EndpointI_connectors callback)
{
- _instance.endpointHostResolver().resolve(_host, _port, this, callback);
+ _instance.endpointHostResolver().resolve(_host, _port, selType, this, callback);
}
//