fix

3 files changed, 18 insertions, 17 deletions

diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 632b2f59894..848c7d5f83e 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -369,7 +369,7 @@ void
 Ice::MarshalException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: error during unmarshaling";
+    out << ":\nprotocol error: error during marshaling or unmarshaling";
 }
 
 void
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index e5f187a55d7..31e5e8a01f4 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -92,25 +92,25 @@ IceInternal::ServantManager::findServant(const Identity& ident) const
 }
 
 void
-IceInternal::ServantManager::addServantLocator(const ServantLocatorPtr& locator, const string& prefix)
+IceInternal::ServantManager::addServantLocator(const ServantLocatorPtr& locator, const string& category)
 {
     IceUtil::Mutex::Lock sync(*this);
 
     assert(_instance); // Must not be called after destruction.
 
-    if(_locatorMap.find(prefix) != _locatorMap.end())
+    if(_locatorMap.find(category) != _locatorMap.end())
     {
 	AlreadyRegisteredException ex(__FILE__, __LINE__);
 	ex.kindOfObject = "servant locator";
-	ex.id = prefix;
+	ex.id = category;
 	throw ex;
     }
     
-    _locatorMapHint = _locatorMap.insert(_locatorMapHint, pair<const string, ServantLocatorPtr>(prefix, locator));
+    _locatorMapHint = _locatorMap.insert(_locatorMapHint, pair<const string, ServantLocatorPtr>(category, locator));
 }
 
 ServantLocatorPtr
-IceInternal::ServantManager::findServantLocator(const string& prefix) const
+IceInternal::ServantManager::findServantLocator(const string& category) const
 {
     IceUtil::Mutex::Lock sync(*this);
     
@@ -118,13 +118,14 @@ IceInternal::ServantManager::findServantLocator(const string& prefix) const
 
     if(_locatorMap.end() != _locatorMapHint)
     {
-	if(_locatorMapHint->first == prefix)
+	if(_locatorMapHint->first == category)
 	{
 	    return _locatorMapHint->second;
 	}
     }
     
-    map<string, ServantLocatorPtr>::iterator p = const_cast<map<string, ServantLocatorPtr>&>(_locatorMap).find(prefix);
+    map<string, ServantLocatorPtr>::iterator p =
+	const_cast<map<string, ServantLocatorPtr>&>(_locatorMap).find(category);
     if(_locatorMap.end() != p)
     {
 	_locatorMapHint = p;
@@ -176,7 +177,7 @@ IceInternal::ServantManager::destroy()
 	    Error out(_instance->logger());
 	    out << "exception during locator deactivation:\n"
 		<< "object adapter: `" << _adapterName << "'\n"
-		<< "locator prefix: `" << p->first << "'\n"
+		<< "locator category: `" << p->first << "'\n"
 		<< ex;
 	}
 	catch(...)
@@ -184,7 +185,7 @@ IceInternal::ServantManager::destroy()
 	    Error out(_instance->logger());
 	    out << "unknown exception during locator deactivation:\n"
 		<< "object adapter: `" << _adapterName << "'\n"
-		<< "locator prefix: `" << p->first << "'";
+		<< "locator category: `" << p->first << "'";
 	}
     }
 
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index 33a41ef19ad..55c29f266fe 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -59,28 +59,28 @@ public final class ServantManager extends Thread
     }
 
     public synchronized void
-    addServantLocator(Ice.ServantLocator locator, String prefix)
+    addServantLocator(Ice.ServantLocator locator, String category)
     {
 	assert(_instance != null); // Must not be called after destruction.
 
-	Ice.ServantLocator l = (Ice.ServantLocator)_locatorMap.get(prefix);
+	Ice.ServantLocator l = (Ice.ServantLocator)_locatorMap.get(category);
 	if(l != null)
 	{
 	    Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException();
-	    ex.id = prefix;
+	    ex.id = category;
 	    ex.kindOfObject = "servant locator";
 	    throw ex;
 	}
 
-        _locatorMap.put(prefix, locator);
+        _locatorMap.put(category, locator);
     }
 
     public synchronized Ice.ServantLocator
-    findServantLocator(String prefix)
+    findServantLocator(String category)
     {
 	assert(_instance != null); // Must not be called after destruction.
 
-        return (Ice.ServantLocator)_locatorMap.get(prefix);
+        return (Ice.ServantLocator)_locatorMap.get(category);
     }
 
     //
@@ -133,7 +133,7 @@ public final class ServantManager extends Thread
 		ex.printStackTrace(pw);
 		pw.flush();
 		String s = "exception during locator deactivation:\n" + "object adapter: `" + _adapterName + "'\n" +
-		    "locator prefix: `" + e.getKey() + "'\n" + sw.toString();
+		    "locator category: `" + e.getKey() + "'\n" + sw.toString();
 		_instance.logger().error(s);
 	    }
 	}