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 /cpp/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 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 20ba0b38b3a..d7ffc2f4d6d 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1225,6 +1225,12 @@ ProxyGetConnection::invokeCollocated(CollocatedRequestHandler*) return AsyncStatusSent; } +Ice::ConnectionPtr +ProxyGetConnection::getConnection() const +{ + return _cachedConnection; +} + void ProxyGetConnection::invoke(const string& operation) { diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 119a0eb178a..a31d4022abb 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -444,8 +444,7 @@ IceProxy::Ice::Object::___end_ice_invoke(pair<const Byte*, const Byte*>& outEnca ::Ice::AsyncResultPtr IceProxy::Ice::Object::__begin_ice_flushBatchRequests(const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool sync) + const ::Ice::LocalObjectPtr& cookie) { class ProxyFlushBatchAsyncWithCallback : public ProxyFlushBatchAsync, public CallbackCompletion { @@ -531,8 +530,7 @@ IceProxy::Ice::Object::__newInstance() const AsyncResultPtr IceProxy::Ice::Object::__begin_ice_getConnection(const ::IceInternal::CallbackBasePtr& del, - const ::Ice::LocalObjectPtr& cookie, - bool sync) + const ::Ice::LocalObjectPtr& cookie) { class ProxyGetConnectionWithCallback : public ProxyGetConnection, public CallbackCompletion { @@ -570,7 +568,7 @@ IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& __result) { AsyncResult::__check(__result, this, ice_getConnection_name); __result->__wait(); - return ice_getCachedConnection(); + return __result->getConnection(); } void |