diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
| commit | 0a52973ce569827357cfa9ac0a2e96c09ffbf7cc (patch) | |
| tree | f219b25bebeca4f1e9e58e7174fe7870675b6246 /java/src/IceInternal/OutgoingConnectionFactory.java | |
| parent | Add Makefile.mak rule to register assemblies in source dir. (diff) | |
| download | ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.bz2 ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.xz ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.zip | |
Fixed ICE-5215: IPv6 support enabled by default
Diffstat (limited to 'java/src/IceInternal/OutgoingConnectionFactory.java')
| -rw-r--r-- | java/src/IceInternal/OutgoingConnectionFactory.java | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java index 95baab48072..76c496c378f 100644 --- a/java/src/IceInternal/OutgoingConnectionFactory.java +++ b/java/src/IceInternal/OutgoingConnectionFactory.java @@ -181,17 +181,8 @@ public final class OutgoingConnectionFactory // try { - java.util.List<Connector> cons = endpoint.connectors(); + java.util.List<Connector> cons = endpoint.connectors(selType); assert(cons.size() > 0); - - // - // Shuffle connectors if endpoint selection type is Random. - // - if(selType == Ice.EndpointSelectionType.Random) - { - java.util.Collections.shuffle(cons); - } - for(Connector c : cons) { connectors.add(new ConnectorInfo(c, endpoint)); @@ -312,8 +303,7 @@ public final class OutgoingConnectionFactory } public void - create(EndpointI[] endpts, boolean hasMore, Ice.EndpointSelectionType selType, - CreateConnectionCallback callback) + create(EndpointI[] endpts, boolean hasMore, Ice.EndpointSelectionType selType, CreateConnectionCallback callback) { assert(endpts.length > 0); @@ -1058,14 +1048,6 @@ public final class OutgoingConnectionFactory public void connectors(java.util.List<Connector> cons) { - // - // Shuffle connectors if endpoint selection type is Random. - // - if(_selType == Ice.EndpointSelectionType.Random) - { - java.util.Collections.shuffle(cons); - } - for(Connector p : cons) { _connectors.add(new ConnectorInfo(p, _currentEndpoint)); @@ -1181,7 +1163,7 @@ public final class OutgoingConnectionFactory { assert(_endpointsIter.hasNext()); _currentEndpoint = _endpointsIter.next(); - _currentEndpoint.connectors_async(this); + _currentEndpoint.connectors_async(_selType, this); } catch(Ice.LocalException ex) { |