Removed removeServantLocator() from ObjectAdapter.

4 files changed, 0 insertions, 40 deletions

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index f96d57b72af..e5b3ea46093 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -278,16 +278,6 @@ Ice::ObjectAdapterI::addServantLocator(const ServantLocatorPtr& locator, const s
     _servantManager->addServantLocator(locator, prefix);
 }
 
-void
-Ice::ObjectAdapterI::removeServantLocator(const string& prefix)
-{
-    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-
-    checkForDeactivation();
-
-    _servantManager->removeServantLocator(prefix);
-}
-
 ServantLocatorPtr
 Ice::ObjectAdapterI::findServantLocator(const string& prefix)
 {
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index db7ca6b4fdd..81564d486aa 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -57,7 +57,6 @@ public:
     virtual void remove(const Identity&);
 
     virtual void addServantLocator(const ServantLocatorPtr&, const std::string&);
-    virtual void removeServantLocator(const std::string&);
     virtual ServantLocatorPtr findServantLocator(const std::string&);
 
     virtual ObjectPtr identityToServant(const Identity&);
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 5dbc853abe9..e5f187a55d7 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -109,34 +109,6 @@ IceInternal::ServantManager::addServantLocator(const ServantLocatorPtr& locator,
     _locatorMapHint = _locatorMap.insert(_locatorMapHint, pair<const string, ServantLocatorPtr>(prefix, locator));
 }
 
-void
-IceInternal::ServantManager::removeServantLocator(const string& prefix)
-{
-    ServantLocatorPtr locator;
-
-    {
-	IceUtil::Mutex::Lock sync(*this);
-
-	assert(_instance); // Must not be called after destruction.
-
-	map<string, ServantLocatorPtr>::iterator p = _locatorMap.find(prefix);
-	if(p == _locatorMap.end())
-	{
-	    NotRegisteredException ex(__FILE__, __LINE__);
-	    ex.kindOfObject = "servant locator";
-	    ex.id = prefix;
-	    throw ex;
-	}
-
-	locator = p->second;
-
-	_locatorMap.erase(p);
-	_locatorMapHint = _locatorMap.end();
-    }
-
-    locator->deactivate(prefix);
-}
-
 ServantLocatorPtr
 IceInternal::ServantManager::findServantLocator(const string& prefix) const
 {
diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h
index 678c0813230..b327be7f8b6 100644
--- a/cpp/src/Ice/ServantManager.h
+++ b/cpp/src/Ice/ServantManager.h
@@ -41,7 +41,6 @@ public:
     Ice::ObjectPtr findServant(const Ice::Identity&) const;
 
     void addServantLocator(const Ice::ServantLocatorPtr& locator, const std::string&);
-    void removeServantLocator(const std::string&);
     Ice::ServantLocatorPtr findServantLocator(const std::string&) const;
 
 private: