diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-10-13 18:38:00 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-10-13 18:38:00 +0000 |
| commit | c14a73455bc317827e2e862d13e30fb20835f4d8 (patch) | |
| tree | bc7a41217c35909d7a930c2f3248bd886ae34f22 /java/src/IceGrid/TreeNode/Node.java | |
| parent | Fix (diff) | |
| download | ice-c14a73455bc317827e2e862d13e30fb20835f4d8.tar.bz2 ice-c14a73455bc317827e2e862d13e30fb20835f4d8.tar.xz ice-c14a73455bc317827e2e862d13e30fb20835f4d8.zip | |
Added editor for replica groups
Diffstat (limited to 'java/src/IceGrid/TreeNode/Node.java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Node.java | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/java/src/IceGrid/TreeNode/Node.java b/java/src/IceGrid/TreeNode/Node.java index 4203a1195d5..7d8f7cd0065 100755 --- a/java/src/IceGrid/TreeNode/Node.java +++ b/java/src/IceGrid/TreeNode/Node.java @@ -931,19 +931,18 @@ class Node extends EditableParent void tryAdd(ServerInstanceDescriptor instanceDescriptor,
- ServerDescriptor serverDescriptor) throws UpdateFailedException
+ ServerDescriptor serverDescriptor,
+ boolean addDescriptor) throws UpdateFailedException
{
try
{
if(instanceDescriptor != null)
{
- _descriptor.serverInstances.add(instanceDescriptor);
addChild(createServer(true, instanceDescriptor, getApplication()),
true);
}
else
{
- _descriptor.servers.add(serverDescriptor);
addChild(createServer(true, serverDescriptor, getApplication()),
true);
}
@@ -951,24 +950,22 @@ class Node extends EditableParent catch(UpdateFailedException e)
{
e.addParent(this);
+ throw e;
+ }
+
+ if(addDescriptor)
+ {
if(instanceDescriptor != null)
{
- removeDescriptor(instanceDescriptor);
+ _descriptor.serverInstances.add(instanceDescriptor);
}
else
{
- removeDescriptor(serverDescriptor);
+ _descriptor.servers.add(serverDescriptor);
}
- throw e;
}
}
-
- void addDescriptor(ServerDescriptor sd)
- {
- _descriptor.servers.add(sd);
- }
-
void removeDescriptor(ServerDescriptor sd)
{
//
@@ -984,10 +981,6 @@ class Node extends EditableParent }
}
}
- void addDescriptor(ServerInstanceDescriptor sd)
- {
- _descriptor.serverInstances.add(sd);
- }
void removeDescriptor(ServerInstanceDescriptor sd)
{
//
|