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/AbstractServerEditor.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/AbstractServerEditor.java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/AbstractServerEditor.java | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/java/src/IceGrid/TreeNode/AbstractServerEditor.java b/java/src/IceGrid/TreeNode/AbstractServerEditor.java index daaca3e8eb6..43813792f92 100755 --- a/java/src/IceGrid/TreeNode/AbstractServerEditor.java +++ b/java/src/IceGrid/TreeNode/AbstractServerEditor.java @@ -47,7 +47,7 @@ abstract class AbstractServerEditor extends Editor try
{
- node.tryAdd(instanceDescriptor, serverDescriptor);
+ node.tryAdd(instanceDescriptor, serverDescriptor, true);
}
catch(UpdateFailedException e)
{
@@ -106,18 +106,10 @@ abstract class AbstractServerEditor extends Editor server.getServerDescriptor();
node.removeChild(server, true);
- if(instanceDescriptor != null)
- {
- node.removeDescriptor(instanceDescriptor);
- }
- else
- {
- node.removeDescriptor(serverDescriptor);
- }
try
{
- node.tryAdd(instanceDescriptor, serverDescriptor);
+ node.tryAdd(instanceDescriptor, serverDescriptor, false);
}
catch(UpdateFailedException e)
{
@@ -125,15 +117,7 @@ abstract class AbstractServerEditor extends Editor // Restore all
//
server.restoreDescriptor(savedDescriptor);
- if(instanceDescriptor != null)
- {
- node.addDescriptor(instanceDescriptor);
- }
- else
- {
- node.addDescriptor(serverDescriptor);
- }
-
+
try
{
node.addChild(server, true);
|