Added createObjectAdapterWithRouter

1 files changed, 13 insertions, 2 deletions

diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index dd72b720636..060201bbb68 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -114,7 +114,7 @@ public final class ObjectAdapterFactory
     }
     
     public synchronized Ice.ObjectAdapter
-    createObjectAdapter(String name, String endpoints)
+    createObjectAdapter(String name, String endpoints, Ice.RouterPrx router)
     {
 	if(_instance == null)
 	{
@@ -127,7 +127,7 @@ public final class ObjectAdapterFactory
 	    throw new Ice.AlreadyRegisteredException("object adapter", name);
         }
 
-        adapter = new Ice.ObjectAdapterI(_instance, _communicator, name, endpoints);
+        adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, name, endpoints, router);
         _adapters.put(name, adapter);
         return adapter;
     }
@@ -160,6 +160,17 @@ public final class ObjectAdapterFactory
         return null;
     }
 
+    public synchronized void
+    removeObjectAdapter(String name)
+    {
+        if(_waitForShutdown)
+	{
+	    return;
+	}
+
+        _adapters.remove(name);
+    }
+
     public void
     flushBatchRequests()
     {