summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ServantManager.java
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-02-29 15:39:34 +0000
committerMarc Laukien <marc@zeroc.com>2004-02-29 15:39:34 +0000
commit71fe343df90f61c8f92c18ac27afd9cb6ae3579a (patch)
treecfaa73e3da737e17fb18aa29d7caf3e584689a63 /java/src/IceInternal/ServantManager.java
parentRemoved throw() (diff)
downloadice-71fe343df90f61c8f92c18ac27afd9cb6ae3579a.tar.bz2
ice-71fe343df90f61c8f92c18ac27afd9cb6ae3579a.tar.xz
ice-71fe343df90f61c8f92c18ac27afd9cb6ae3579a.zip
fix
Diffstat (limited to 'java/src/IceInternal/ServantManager.java')
-rw-r--r--java/src/IceInternal/ServantManager.java14
1 files changed, 7 insertions, 7 deletions
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);
}
}