diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2009-04-22 14:31:06 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2009-04-22 14:31:06 -0230 |
commit | b1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9 (patch) | |
tree | c1ff69a157ceeea884655ce652f5d63044f6ba1e /java/src/IceInternal/ObjectAdapterFactory.java | |
parent | Fixed couple of windows build issues (diff) | |
download | ice-b1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9.tar.bz2 ice-b1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9.tar.xz ice-b1d5e83f544f252d9718ec4e8d2be7f0ad6ccbe9.zip |
Bug 3137 - createObjectAdpter methods write properties
Diffstat (limited to 'java/src/IceInternal/ObjectAdapterFactory.java')
-rw-r--r-- | java/src/IceInternal/ObjectAdapterFactory.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java index 8d88340d0b0..672a0c100bd 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/IceInternal/ObjectAdapterFactory.java @@ -146,7 +146,7 @@ public final class ObjectAdapterFactory } public synchronized Ice.ObjectAdapter - createObjectAdapter(String name, String endpoints, Ice.RouterPrx router) + createObjectAdapter(String name, Ice.RouterPrx router) { if(_instance == null) { @@ -159,22 +159,15 @@ public final class ObjectAdapterFactory throw new Ice.AlreadyRegisteredException("object adapter", name); } - 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 = java.util.UUID.randomUUID().toString(); - adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, uuid, "", null, true); + adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, uuid, null, true); _adapters.put(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.put(name, adapter); } return adapter; |