diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-02-27 18:44:35 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-02-27 18:44:35 +0100 |
| commit | 22e5ac4c9fd4262531c553263e02175976525d3c (patch) | |
| tree | 05db3f48d017adfd493bc2b81b9d313da56e43ac /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Fixed UWP connection memory leak (ICE-8686) (diff) | |
| download | ice-22e5ac4c9fd4262531c553263e02175976525d3c.tar.bz2 ice-22e5ac4c9fd4262531c553263e02175976525d3c.tar.xz ice-22e5ac4c9fd4262531c553263e02175976525d3c.zip | |
Fixed invalid OA comments and some JS local interface operations
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 903ea04336e..283832c4ea9 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -274,11 +274,6 @@ Ice::ObjectAdapterI::deactivate() ICE_NOEXCEPT // } - // - // Must be called outside the thread synchronization, because - // Connection::destroy() might block when sending a CloseConnection - // message. - // #ifdef ICE_CPP11_MAPPING for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(), [](const IncomingConnectionFactoryPtr& factory) @@ -290,11 +285,6 @@ Ice::ObjectAdapterI::deactivate() ICE_NOEXCEPT Ice::voidMemFun(&IncomingConnectionFactory::destroy)); #endif - // - // Must be called outside the thread synchronization, because - // changing the object adapter might block if there are still - // requests being dispatched. - // _instance->outgoingConnectionFactory()->removeAdapter(ICE_SHARED_FROM_THIS); { |