diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-08-09 10:27:05 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-08-09 10:27:05 +0200 |
| commit | dd668368ea1323e6f94f0edbaa6fc382db6b4d2c (patch) | |
| tree | 2ca1af321c9ba86d42ecfac0885dab6311efa128 /java/src | |
| parent | Fixed ICE-7197 - ported AMI missing test to C++11 (diff) | |
| download | ice-dd668368ea1323e6f94f0edbaa6fc382db6b4d2c.tar.bz2 ice-dd668368ea1323e6f94f0edbaa6fc382db6b4d2c.tar.xz ice-dd668368ea1323e6f94f0edbaa6fc382db6b4d2c.zip | |
Fixed ICE-7270 - ice_getConnection now returns a non-null connection even if connection caching is disabled
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java | 2 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java | 6 |
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 |