Added createObjectAdapterWithRouter

1 files changed, 16 insertions, 2 deletions

diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 162e2e565c3..bd1c9152be6 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -100,7 +100,8 @@ IceInternal::ObjectAdapterFactory::waitForShutdown()
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const string& endpoints)
+IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const string& endpoints, 
+						       const RouterPrx& router)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -115,7 +116,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
 	throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
     }
 
-    ObjectAdapterIPtr adapter = new ObjectAdapterI(_instance, _communicator, name, endpoints);
+    ObjectAdapterIPtr adapter = new ObjectAdapterI(_instance, _communicator, this, name, endpoints, router);
     _adapters.insert(make_pair(name, adapter));
     return adapter;
 }
@@ -148,6 +149,19 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
     return 0;
 }
 
+void
+IceInternal::ObjectAdapterFactory::removeObjectAdapter(const string& name)
+{
+    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
+    if(_waitForShutdown)
+    {
+        return;
+    }
+
+    _adapters.erase(name);
+}
+
 namespace IceInternal {
 
 struct FlushAdapter