summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/OutgoingAsync.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-08-09 10:27:05 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-08-09 10:27:05 +0200
commitdd668368ea1323e6f94f0edbaa6fc382db6b4d2c (patch)
tree2ca1af321c9ba86d42ecfac0885dab6311efa128 /cpp/src/Ice/OutgoingAsync.cpp
parentFixed ICE-7197 - ported AMI missing test to C++11 (diff)
downloadice-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/Ice/OutgoingAsync.cpp')
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp6
1 files changed, 6 insertions, 0 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)
{