diff options
| author | Marc Laukien <marc@zeroc.com> | 2003-01-31 15:26:55 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2003-01-31 15:26:55 +0000 |
| commit | 67f771ce63b6cb4c0ffc3b7ab775e0034fde8c30 (patch) | |
| tree | 2d20a9e07b91a11f4b0c9b90fa542a40c63be9fe /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | c->z (diff) | |
| download | ice-67f771ce63b6cb4c0ffc3b7ab775e0034fde8c30.tar.bz2 ice-67f771ce63b6cb4c0ffc3b7ab775e0034fde8c30.tar.xz ice-67f771ce63b6cb4c0ffc3b7ab775e0034fde8c30.zip | |
fix
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; } |