summaryrefslogtreecommitdiff
path: root/cs/src/Ice/ObjectAdapterFactory.cs
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-04-12 17:32:00 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-04-12 17:32:00 +0000
commitb764fe6ce04b1367522a20a518933cca3ae54c66 (patch)
tree9334709074a791244c90a5ea78240ba930a93524 /cs/src/Ice/ObjectAdapterFactory.cs
parentFix (diff)
downloadice-b764fe6ce04b1367522a20a518933cca3ae54c66.tar.bz2
ice-b764fe6ce04b1367522a20a518933cca3ae54c66.tar.xz
ice-b764fe6ce04b1367522a20a518933cca3ae54c66.zip
Added createObjectAdapterWithRouter
Diffstat (limited to 'cs/src/Ice/ObjectAdapterFactory.cs')
-rwxr-xr-xcs/src/Ice/ObjectAdapterFactory.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/cs/src/Ice/ObjectAdapterFactory.cs
index 017a3c0f99e..c3e5df61b6c 100755
--- a/cs/src/Ice/ObjectAdapterFactory.cs
+++ b/cs/src/Ice/ObjectAdapterFactory.cs
@@ -101,7 +101,7 @@ namespace IceInternal
}
}
- public Ice.ObjectAdapter createObjectAdapter(string name, string endpoints)
+ public Ice.ObjectAdapter createObjectAdapter(string name, string endpoints, Ice.RouterPrx router)
{
lock(this)
{
@@ -119,7 +119,7 @@ namespace IceInternal
throw ex;
}
- adapter = new Ice.ObjectAdapterI(instance_, _communicator, name, endpoints);
+ adapter = new Ice.ObjectAdapterI(instance_, _communicator, this, name, endpoints, router);
_adapters[name] = adapter;
return adapter;
}
@@ -154,6 +154,19 @@ namespace IceInternal
return null;
}
}
+
+ public void removeObjectAdapter(string name)
+ {
+ lock(this)
+ {
+ if(_waitForShutdown)
+ {
+ return;
+ }
+
+ _adapters.Remove(name);
+ }
+ }
public void flushBatchRequests()
{