Removed dead code (sync. connection establishment code)

7 files changed, 5 insertions, 96 deletions

diff --git a/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java b/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java
index e0ea6773d1b..e4bf256ea2d 100644
--- a/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java
+++ b/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java
@@ -31,67 +31,6 @@ class EndpointHostResolver
         }
     }
 
-    java.util.List<Connector> resolve(String host, int port, Ice.EndpointSelectionType selType, IPEndpointI endpoint)
-    {
-        //
-        // Try to get the addresses without DNS lookup. If this doesn't
-        // work, we retry with DNS lookup (and observer).
-        //
-        NetworkProxy networkProxy = _instance.networkProxy();
-        if(networkProxy == null)
-        {
-            java.util.List<java.net.InetSocketAddress> addrs = Network.getAddresses(host, port, _protocol, selType,
-                                                                                    _preferIPv6, false);
-            if(addrs != null)
-            {
-                return endpoint.connectors(addrs, networkProxy);
-            }
-        }
-
-        Ice.Instrumentation.CommunicatorObserver obsv = _instance.initializationData().observer;
-        Ice.Instrumentation.Observer observer = null;
-        if(obsv != null)
-        {
-            observer = obsv.getEndpointLookupObserver(endpoint);
-            if(observer != null)
-            {
-                observer.attach();
-            }
-        }
-
-        java.util.List<Connector> connectors = null;
-        try
-        {
-            int protocol = _protocol;
-            if(networkProxy != null)
-            {
-                networkProxy = networkProxy.resolveHost(_protocol);
-                if(networkProxy != null)
-                {
-                    protocol = networkProxy.getProtocolSupport();
-                }
-            }
-            connectors = endpoint.connectors(Network.getAddresses(host, port, protocol, selType, _preferIPv6, true), 
-                                             networkProxy);
-        }
-        catch(Ice.LocalException ex)
-        {
-            if(observer != null)
-            {
-                observer.failed(ex.ice_name());
-            }
-            throw ex;
-        }
-        finally
-        {
-            if(observer != null)
-            {
-                observer.detach();
-            }
-        }
-        return connectors;
-    }
-
     synchronized void resolve(final String host, final int port, final Ice.EndpointSelectionType selType, 
                               final IPEndpointI endpoint, final EndpointI_connectors callback)
     {
diff --git a/java/src/Ice/src/main/java/IceInternal/EndpointI.java b/java/src/Ice/src/main/java/IceInternal/EndpointI.java
index 7e6d487f7f2..51a87fd0cf5 100644
--- a/java/src/Ice/src/main/java/IceInternal/EndpointI.java
+++ b/java/src/Ice/src/main/java/IceInternal/EndpointI.java
@@ -101,7 +101,6 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable<En
     // Return connectors for this endpoint, or empty list if no connector
     // is available.
     //
-    public abstract java.util.List<Connector> connectors(Ice.EndpointSelectionType selType);
     public abstract void connectors_async(Ice.EndpointSelectionType selType, EndpointI_connectors callback);
 
     //
diff --git a/java/src/Ice/src/main/java/IceInternal/FixedReference.java b/java/src/Ice/src/main/java/IceInternal/FixedReference.java
index 6a5d6fc6bc1..cc7bd2dfe4f 100644
--- a/java/src/Ice/src/main/java/IceInternal/FixedReference.java
+++ b/java/src/Ice/src/main/java/IceInternal/FixedReference.java
@@ -215,7 +215,6 @@ public class FixedReference extends Reference
     {
         try
         {
-            Ice.Holder<Boolean> compress = new Ice.Holder<Boolean>();
             switch(getMode())
             {
                 case Reference.ModeTwoway:
@@ -261,19 +260,20 @@ public class FixedReference extends Reference
 
             _fixedConnection.throwException(); // Throw in case our connection is already destroyed.
 
+            boolean compress;
             if(defaultsAndOverrides.overrideCompress)
             {
-                compress.value = defaultsAndOverrides.overrideCompressValue;
+                compress = defaultsAndOverrides.overrideCompressValue;
             }
             else if(_overrideCompress)
             {
-                compress.value = _compress;
+                compress = _compress;
             }
             else
             {
-                compress.value = _fixedConnection.endpoint().compress();
+                compress = _fixedConnection.endpoint().compress();
             }
-            callback.setConnection(_fixedConnection, compress.value);
+            callback.setConnection(_fixedConnection, compress);
         }
         catch(Ice.LocalException ex)
         {
diff --git a/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java b/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java
index fbea1b8a690..715bb8a9748 100644
--- a/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java
+++ b/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java
@@ -109,12 +109,6 @@ public abstract class IPEndpointI extends EndpointI
     }
 
     @Override
-    public java.util.List<Connector> connectors(Ice.EndpointSelectionType selType)
-    {
-        return _instance.resolve(_host, _port, selType, this);
-    }
-
-    @Override
     public void connectors_async(Ice.EndpointSelectionType selType, EndpointI_connectors callback)
     {
         _instance.resolve(_host, _port, selType, this, callback);
diff --git a/java/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java b/java/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java
index 3a3ab472863..1fc84cf1715 100644
--- a/java/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java
+++ b/java/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java
@@ -188,12 +188,6 @@ final class OpaqueEndpointI extends EndpointI
     // is available.
     //
     @Override
-    public java.util.List<Connector> connectors(Ice.EndpointSelectionType selType)
-    {
-        return new java.util.ArrayList<Connector>();
-    }
-
-    @Override
     public void connectors_async(Ice.EndpointSelectionType selType, EndpointI_connectors callback)
     {
         callback.connectors(new java.util.ArrayList<Connector>());
diff --git a/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java b/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java
index 9e217d9df4a..ba3bbbdf0e5 100644
--- a/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java
+++ b/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java
@@ -92,11 +92,6 @@ public class ProtocolInstance
         return _instance.messageSizeMax();
     }
 
-    public java.util.List<Connector> resolve(String host, int port, Ice.EndpointSelectionType type, IPEndpointI endpt)
-    {
-        return _instance.endpointHostResolver().resolve(host, port, type, endpt);
-    }
-
     public void resolve(String host, int port, Ice.EndpointSelectionType type, IPEndpointI endpt,
                         EndpointI_connectors callback)
     {
diff --git a/java/src/Ice/src/main/java/IceInternal/WSEndpoint.java b/java/src/Ice/src/main/java/IceInternal/WSEndpoint.java
index f8f248beb00..31111f85752 100644
--- a/java/src/Ice/src/main/java/IceInternal/WSEndpoint.java
+++ b/java/src/Ice/src/main/java/IceInternal/WSEndpoint.java
@@ -163,18 +163,6 @@ final class WSEndpoint extends IceInternal.EndpointI
     }
 
     @Override
-    public java.util.List<Connector> connectors(Ice.EndpointSelectionType selType)
-    {
-        java.util.List<Connector> connectors = _delegate.connectors(selType);
-        java.util.List<Connector> l = new java.util.ArrayList<Connector>();
-        for(Connector c : connectors)
-        {
-            l.add(new WSConnector(_instance, c, _delegate.host(), _delegate.port(), _resource));
-        }
-        return l;
-    }
-
-    @Override
     public void connectors_async(Ice.EndpointSelectionType selType, final EndpointI_connectors callback)
     {
         EndpointI_connectors cb = new EndpointI_connectors()