2 files changed, 7 insertions, 1 deletions
diff --git a/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java b/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java
index 3d88ca367eb..fa60f0a62f2 100644
--- a/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java
@@ -2371,7 +2371,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
     {
         IceInternal.ProxyGetConnection result = IceInternal.ProxyGetConnection.check(r, this, __ice_getConnection_name);
         result.__wait();
-        return ice_getCachedConnection();
+        return result.getConnection();
     }
 
     static public void __ice_getConnection_completed(TwowayCallbackArg1<Ice.Connection> cb, AsyncResult result)
diff --git a/java/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java b/java/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java
index f0dd8cb1afe..f4da8e83e12 100644
--- a/java/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java
+++ b/java/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java
@@ -52,6 +52,12 @@ public class ProxyGetConnection extends ProxyOutgoingAsyncBase
         return AsyncStatus.Sent;
     }
 
+    @Override
+    public Ice.Connection getConnection()
+    {
+        return _cachedConnection;
+    }
+
     public void invoke()
     {
         invokeImpl(true); // userThread = true