diff options
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterFactory.cpp')
-rw-r--r-- | cpp/src/Ice/ObjectAdapterFactory.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index 5004a337b59..492ba389f70 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -27,7 +27,7 @@ IceInternal::ObjectAdapterFactory::shutdown() { IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - + // // Ignore shutdown requests if the object adapter factory has // already been shut down. @@ -36,15 +36,15 @@ IceInternal::ObjectAdapterFactory::shutdown() { return; } - + adapters = _adapters; - + _instance = 0; _communicator = 0; - + notifyAll(); } - + // // Deactivate outside the thread synchronization, to avoid // deadlocks. @@ -59,7 +59,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown() { IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - + // // First we wait for the shutdown of the factory itself. // @@ -167,7 +167,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) { return 0; } - + adapters = _adapters; } @@ -211,7 +211,7 @@ IceInternal::ObjectAdapterFactory::removeObjectAdapter(const ObjectAdapterPtr& a } void -IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync) const +IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) const { list<ObjectAdapterIPtr> adapters; { |