summaryrefslogtreecommitdiff
path: root/cs/src/Ice/ObjectAdapterFactory.cs
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-04-22 14:31:06 -0230
committerDwayne Boone <dwayne@zeroc.com>2009-04-22 14:31:06 -0230
commitb1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9 (patch)
treec1ff69a157ceeea884655ce652f5d63044f6ba1e /cs/src/Ice/ObjectAdapterFactory.cs
parentFixed couple of windows build issues (diff)
downloadice-b1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9.tar.bz2
ice-b1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9.tar.xz
ice-b1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9.zip
Bug 3137 - createObjectAdpter methods write properties
Diffstat (limited to 'cs/src/Ice/ObjectAdapterFactory.cs')
-rw-r--r--cs/src/Ice/ObjectAdapterFactory.cs13
1 files changed, 3 insertions, 10 deletions
diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/cs/src/Ice/ObjectAdapterFactory.cs
index a00cbabd4bc..96ba915376c 100644
--- a/cs/src/Ice/ObjectAdapterFactory.cs
+++ b/cs/src/Ice/ObjectAdapterFactory.cs
@@ -130,7 +130,7 @@ namespace IceInternal
}
}
- public Ice.ObjectAdapter createObjectAdapter(string name, string endpoints, Ice.RouterPrx router)
+ public Ice.ObjectAdapter createObjectAdapter(string name, Ice.RouterPrx router)
{
lock(this)
{
@@ -148,22 +148,15 @@ namespace IceInternal
throw ex;
}
- if(name.Length == 0 && (endpoints.Length != 0 || router != null))
- {
- Ice.InitializationException ex = new Ice.InitializationException();
- ex.reason = "Cannot configure endpoints or router with nameless object adapter";
- throw ex;
- }
-
if(name.Length == 0)
{
string uuid = Ice.Util.generateUUID();
- adapter = new Ice.ObjectAdapterI(instance_, _communicator, this, uuid, "", null, true);
+ adapter = new Ice.ObjectAdapterI(instance_, _communicator, this, uuid, null, true);
_adapters[uuid] = adapter;
}
else
{
- adapter = new Ice.ObjectAdapterI(instance_, _communicator, this, name, endpoints, router, false);
+ adapter = new Ice.ObjectAdapterI(instance_, _communicator, this, name, router, false);
_adapters[name] = adapter;
}
return adapter;