From 58115b73754da3af2e0bb7a55f0815e6391e0d40 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 10 Sep 2009 01:18:39 +0200 Subject: 2564 - ObjectAdapter::removeServantLocator --- cpp/src/Ice/ServantManager.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'cpp/src/Ice/ServantManager.cpp') diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp index 146219aabc0..080ba9ee042 100644 --- a/cpp/src/Ice/ServantManager.cpp +++ b/cpp/src/Ice/ServantManager.cpp @@ -361,15 +361,17 @@ IceInternal::ServantManager::removeServantLocator(const string& category) p = _locatorMap.find(category); } - ServantLocatorPtr locator; - - if(p != _locatorMap.end()) + if(p == _locatorMap.end()) { - locator = p->second; - _locatorMap.erase(p); - _locatorMapHint = _locatorMap.begin(); + NotRegisteredException ex(__FILE__, __LINE__); + ex.kindOfObject = "servant locator"; + ex.id = IceUtilInternal::escapeString(category, ""); + throw ex; } + ServantLocatorPtr locator = p->second; + _locatorMap.erase(p); + _locatorMapHint = _locatorMap.begin(); return locator; } -- cgit v1.2.3