1 files changed, 52 insertions, 60 deletions
diff --git a/java/src/IceInternal/FixedReference.java b/java/src/IceInternal/FixedReference.java
index 9df5d5f4b68..c930fe6156c 100644
--- a/java/src/IceInternal/FixedReference.java
+++ b/java/src/IceInternal/FixedReference.java
@@ -210,78 +210,70 @@ public class FixedReference extends Reference
     }
 
     @Override
-    public Ice.ConnectionI
-    getConnection(Ice.BooleanHolder compress)
+    public void
+    getConnection(GetConnectionCallback callback)
     {
-        switch(getMode())
+        try
         {
-            case Reference.ModeTwoway:
-            case Reference.ModeOneway:
-            case Reference.ModeBatchOneway:
+            Ice.BooleanHolder compress = new Ice.BooleanHolder();
+            switch(getMode())
             {
-                if(_fixedConnection.endpoint().datagram())
+                case Reference.ModeTwoway:
+                case Reference.ModeOneway:
+                case Reference.ModeBatchOneway:
                 {
-                    throw new Ice.NoEndpointException("");
+                    if(_fixedConnection.endpoint().datagram())
+                    {
+                        throw new Ice.NoEndpointException("");
+                    }
+                    break;
                 }
-                break;
-            }
 
-            case Reference.ModeDatagram:
-            case Reference.ModeBatchDatagram:
-            {
-                if(!_fixedConnection.endpoint().datagram())
+                case Reference.ModeDatagram:
+                case Reference.ModeBatchDatagram:
                 {
-                    throw new Ice.NoEndpointException("");
+                    if(!_fixedConnection.endpoint().datagram())
+                    {
+                        throw new Ice.NoEndpointException("");
+                    }
+                    break;
                 }
-                break;
             }
-        }
-
-        //
-        // If a secure connection is requested or secure overrides is set,
-        // check if the connection is secure.
-        //
-        boolean secure;
-        DefaultsAndOverrides defaultsAndOverrides = getInstance().defaultsAndOverrides();
-        if(defaultsAndOverrides.overrideSecure)
-        {
-            secure = defaultsAndOverrides.overrideSecureValue;
-        }
-        else
-        {
-            secure = getSecure();
-        }
-        if(secure && !_fixedConnection.endpoint().secure())
-        {
-            throw new Ice.NoEndpointException("");
-        }
 
-        _fixedConnection.throwException(); // Throw in case our connection is already destroyed.
+            //
+            // If a secure connection is requested or secure overrides is set,
+            // check if the connection is secure.
+            //
+            boolean secure;
+            DefaultsAndOverrides defaultsAndOverrides = getInstance().defaultsAndOverrides();
+            if(defaultsAndOverrides.overrideSecure)
+            {
+                secure = defaultsAndOverrides.overrideSecureValue;
+            }
+            else
+            {
+                secure = getSecure();
+            }
+            if(secure && !_fixedConnection.endpoint().secure())
+            {
+                throw new Ice.NoEndpointException("");
+            }
 
-        if(defaultsAndOverrides.overrideCompress)
-        {
-            compress.value = defaultsAndOverrides.overrideCompressValue;
-        }
-        else if(_overrideCompress)
-        {
-            compress.value = _compress;
-        }
-        else
-        {
-            compress.value = _fixedConnection.endpoint().compress();
-        }
-        return _fixedConnection;
-    }
+            _fixedConnection.throwException(); // Throw in case our connection is already destroyed.
 
-    @Override
-    public void
-    getConnection(GetConnectionCallback callback)
-    {
-        try
-        {
-            Ice.BooleanHolder compress = new Ice.BooleanHolder();
-            Ice.ConnectionI connection = getConnection(compress);
-            callback.setConnection(connection, compress.value);
+            if(defaultsAndOverrides.overrideCompress)
+            {
+                compress.value = defaultsAndOverrides.overrideCompressValue;
+            }
+            else if(_overrideCompress)
+            {
+                compress.value = _compress;
+            }
+            else
+            {
+                compress.value = _fixedConnection.endpoint().compress();
+            }
+            callback.setConnection(_fixedConnection, compress.value);
         }
         catch(Ice.LocalException ex)
         {