diff options
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index b9b3ed23581..e8b2c6858de 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -312,6 +312,10 @@ Ice::ObjectAdapterI::identityToServant(const Identity& ident) ObjectPtr Ice::ObjectAdapterI::proxyToServant(const ObjectPrx& proxy) { + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); + + checkForDeactivation(); + ReferencePtr ref = proxy->__reference(); return identityToServant(ref->identity); } @@ -502,12 +506,12 @@ ThreadPoolPtr Ice::ObjectAdapterI::getThreadPool() const { // No mutex lock necessary, _threadPool and _instance are - // immutable after creation until it is removed in + // immutable after creation until they are removed in // waitForDeactivate(). // Not check for deactivation here! - assert(_threadPool || _instance); // Must not be called after waitForDeactivate(). + assert(_instance); // Must not be called after waitForDeactivate(). if(_threadPool) { @@ -517,8 +521,6 @@ Ice::ObjectAdapterI::getThreadPool() const { return _instance->serverThreadPool(); } - - return _threadPool; } ServantManagerPtr |