summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterI.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-02-12 13:16:05 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-02-12 13:16:19 +0100
commitd31ac1757348fca291a1357421322f721eb72e8d (patch)
tree92f079716da9b13a5191af9d4a38b1f35d1cf6fc /cpp/src/Ice/ObjectAdapterI.h
parentFixed JS timeout test to prevent sporadic IE failures (diff)
downloadice-d31ac1757348fca291a1357421322f721eb72e8d.tar.bz2
ice-d31ac1757348fca291a1357421322f721eb72e8d.tar.xz
ice-d31ac1757348fca291a1357421322f721eb72e8d.zip
Ensure Ice::Connection::setAdapter fails if the adapter is deactivated (ICE-8659)
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index c682599cb0a..ee2a330e92a 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -103,6 +103,7 @@ public:
IceInternal::ThreadPoolPtr getThreadPool() const;
IceInternal::ServantManagerPtr getServantManager() const;
IceInternal::ACMConfig getACM() const;
+ void setAdapterOnConnection(const Ice::ConnectionIPtr&);
size_t messageSizeMax() const { return _messageSizeMax; }
ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&,