From 163524e3cc1a379aba34c21d7702c4e70d56c42e Mon Sep 17 00:00:00 2001
From: Marc Laukien <marc@zeroc.com>
Date: Thu, 6 Feb 2003 15:24:04 +0000
Subject: fix

---
 cpp/src/Ice/ObjectAdapterI.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'cpp/src/Ice/ObjectAdapterI.cpp')

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 8227753a4d4..94cc1baa354 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -526,9 +526,13 @@ Ice::ObjectAdapterI::getThreadPool() const
 ServantManagerPtr
 Ice::ObjectAdapterI::getServantManager() const
 {
-    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+    // No mutex lock necessary, _threadPool and _instance are
+    // immutable after creation until they are removed in
+    // waitForDeactivate().
 
-    checkForDeactivation();
+    // Not check for deactivation here!
+
+    assert(_instance); // Must not be called after waitForDeactivate().
 
     return _servantManager;
 }
-- 
cgit v1.2.3