diff options
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 50dd2cfa867..e66143c6235 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -526,12 +526,10 @@ Ice::ObjectAdapterI::getThreadPool() const ServantManagerPtr Ice::ObjectAdapterI::getServantManager() const { - // No mutex lock necessary, _servantManager is immutable after - // creation until it is removed in waitForDeactivate(). + IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - // Not check for deactivation here! + checkForDeactivation(); - assert(_servantManager); // Must not be called after waitForDeactivate(). return _servantManager; } |