diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-09-12 23:48:03 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-09-12 23:48:03 +0000 |
| commit | 188f3831ee428bd8517345a30b76b2ab8ff8361b (patch) | |
| tree | 2d131ebf4e082adc40de933b5a8af21e338a9e4b /cpp/src/Ice/ObjectAdapterFactory.cpp | |
| parent | removing print statement (diff) | |
| download | ice-188f3831ee428bd8517345a30b76b2ab8ff8361b.tar.bz2 ice-188f3831ee428bd8517345a30b76b2ab8ff8361b.tar.xz ice-188f3831ee428bd8517345a30b76b2ab8ff8361b.zip | |
fixing bug 400
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterFactory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index e61834a856f..c2fec862545 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -25,7 +25,7 @@ IceInternal::ObjectAdapterFactory::shutdown() map<string, ObjectAdapterIPtr> adapters; { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); // // Ignore shutdown requests if the object adapter factory has @@ -56,7 +56,7 @@ void IceInternal::ObjectAdapterFactory::waitForShutdown() { { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); // // First we wait for the shutdown of the factory itself. @@ -89,7 +89,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown() _adapters.clear(); { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); // // Signal that waiting is complete. @@ -102,7 +102,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown() ObjectAdapterPtr IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const string& endpoints) { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); if(!_instance) { @@ -123,7 +123,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const ObjectAdapterPtr IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); if(!_instance) { @@ -165,7 +165,7 @@ IceInternal::ObjectAdapterFactory::flushBatchRequests() const { list<ObjectAdapterIPtr> a; { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); for(map<string, ObjectAdapterIPtr>::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p) { |