1 files changed, 1 insertions, 7 deletions
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index dce9f66f87b..0b3ca50e412 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -571,13 +571,7 @@ Ice::ObjectAdapter::decDirectCount()
 ServantManagerPtr
 Ice::ObjectAdapter::getServantManager() const
 {
-    // No mutex lock necessary, _instance is
-    // immutable after creation until it is removed in
-    // waitForDeactivate().
-
-    // Not check for deactivation here!
-
-    assert(_instance); // Must not be called after waitForDeactivate().
+    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
     return _servantManager;
 }