diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-30 05:05:40 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-30 05:05:40 +0000 |
| commit | 5b09c30824c73891b2e8a8fa1aad5925ee77c2d5 (patch) | |
| tree | 3fffb7203973521d5c47f29e2eb2b7f6e683d6bb /java/src/Ice/ObjectAdapterI.java | |
| parent | Added support for <adapter name>.ReplicaId. (diff) | |
| download | ice-5b09c30824c73891b2e8a8fa1aad5925ee77c2d5.tar.bz2 ice-5b09c30824c73891b2e8a8fa1aad5925ee77c2d5.tar.xz ice-5b09c30824c73891b2e8a8fa1aad5925ee77c2d5.zip | |
Added support for <adapter name>.ReplicaId and IceGrid demo fixes.
Diffstat (limited to 'java/src/Ice/ObjectAdapterI.java')
| -rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index a7000f4c7f1..4a3383caf86 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -34,6 +34,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt Ice.LocatorRegistryPrx locatorRegistry = null; boolean registerProcess = false; String serverId = ""; + String replicaId = ""; Communicator communicator = null; boolean printAdapterReady = false; @@ -50,6 +51,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt registerProcess = _instance.properties().getPropertyAsInt(_name + ".RegisterProcess") > 0; serverId = _instance.properties().getProperty("Ice.ServerId"); + replicaId = _instance.properties().getPropertyWithDefault(_name + ".ReplicaId", serverId); printAdapterReady = _instance.properties().getPropertyAsInt("Ice.PrintAdapterReady") > 0; if(registerProcess && locatorRegistry == null) @@ -95,24 +97,17 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt Identity ident = new Identity(); ident.category = ""; ident.name = "dummy"; - locatorRegistry.setAdapterDirectProxy(serverId, _id, createDirectProxy(ident)); + locatorRegistry.setAdapterDirectProxy(_id, replicaId, createDirectProxy(ident)); } catch(ObjectAdapterDeactivatedException ex) { // IGNORE: The object adapter is already inactive. } - catch(ServerNotFoundException ex) - { - NotRegisteredException ex1 = new NotRegisteredException(); - ex1.id = serverId; - ex1.kindOfObject = "server"; - throw ex1; - } catch(AdapterNotFoundException ex) { NotRegisteredException ex1 = new NotRegisteredException(); - ex1.id = _id; ex1.kindOfObject = "object adapter"; + ex1.id = ex.replica ? _id + " (replica = " + replicaId + ")" : _id; throw ex1; } catch(AdapterAlreadyActiveException ex) |