diff options
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 8 | ||||
-rw-r--r-- | java/src/IceInternal/ServantManager.java | 22 |
2 files changed, 0 insertions, 30 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 448a8c7795e..d9fbb6c84d4 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -285,14 +285,6 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt _servantManager.addServantLocator(locator, prefix); } - public synchronized void - removeServantLocator(String prefix) - { - checkForDeactivation(); - - _servantManager.removeServantLocator(prefix); - } - public synchronized ServantLocator findServantLocator(String prefix) { diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index a6335691ee8..33a41ef19ad 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -75,28 +75,6 @@ public final class ServantManager extends Thread _locatorMap.put(prefix, locator); } - public void - removeServantLocator(String prefix) - { - Ice.ServantLocator locator; - - synchronized(this) - { - assert(_instance != null); // Must not be called after destruction. - - locator = (Ice.ServantLocator)_locatorMap.remove(prefix); - if(locator == null) - { - Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = prefix; - ex.kindOfObject = "servant locator"; - throw ex; - } - } - - locator.deactivate(prefix); - } - public synchronized Ice.ServantLocator findServantLocator(String prefix) { |