Bug 2564 - ObjectAdapter::removeServantLocator

2 files changed, 21 insertions, 0 deletions

diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 8fbfb2bc4f8..62589a5bad7 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -512,6 +512,14 @@ public final class ObjectAdapterI implements ObjectAdapter
     }
 
     public synchronized ServantLocator
+    removeServantLocator(String prefix)
+    {
+        checkForDeactivation();
+
+        return _servantManager.removeServantLocator(prefix);
+    }
+
+    public synchronized ServantLocator
     findServantLocator(String prefix)
     {
         checkForDeactivation();
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)
     {
         //