summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ServantManager.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2009-07-02 19:39:13 +0200
committerJose <jose@zeroc.com>2009-07-02 19:39:13 +0200
commitb288490bceaab7f9c20eb9de62fa7a7ff4f6a917 (patch)
tree8645fb6933ced669886f71f415eb57f676912ebf /java/src/IceInternal/ServantManager.java
parentFixed test failure introduce by previous fix (diff)
downloadice-b288490bceaab7f9c20eb9de62fa7a7ff4f6a917.tar.bz2
ice-b288490bceaab7f9c20eb9de62fa7a7ff4f6a917.tar.xz
ice-b288490bceaab7f9c20eb9de62fa7a7ff4f6a917.zip
Bug 2564 - ObjectAdapter::removeServantLocator
Diffstat (limited to 'java/src/IceInternal/ServantManager.java')
-rw-r--r--java/src/IceInternal/ServantManager.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index ba3c1f80cac..01ded95ffd0 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -227,6 +227,19 @@ public final class ServantManager
}
public synchronized Ice.ServantLocator
+ removeServantLocator(String category)
+ {
+ assert(_instance != null); // Must not be called after destruction.
+
+ Ice.ServantLocator l = _locatorMap.remove(category);
+ if(l != null)
+ {
+ l.deactivate(category);
+ }
+ return l;
+ }
+
+ public synchronized Ice.ServantLocator
findServantLocator(String category)
{
//