summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rwxr-xr-xjava/src/IceGrid/TreeNode/AbstractServerEditor.java5
-rwxr-xr-xjava/src/IceGrid/TreeNode/ReplicaGroupEditor.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/java/src/IceGrid/TreeNode/AbstractServerEditor.java b/java/src/IceGrid/TreeNode/AbstractServerEditor.java
index d67c54f6dac..3345b7d4692 100755
--- a/java/src/IceGrid/TreeNode/AbstractServerEditor.java
+++ b/java/src/IceGrid/TreeNode/AbstractServerEditor.java
@@ -120,9 +120,7 @@ abstract class AbstractServerEditor extends Editor
{
//
// Restore all
- //
- server.restoreDescriptor(savedDescriptor);
-
+ //
try
{
node.addChild(server, true);
@@ -131,6 +129,7 @@ abstract class AbstractServerEditor extends Editor
{
assert false;
}
+ server.restoreDescriptor(savedDescriptor);
model.setSelectionPath(server.getPath());
JOptionPane.showMessageDialog(
diff --git a/java/src/IceGrid/TreeNode/ReplicaGroupEditor.java b/java/src/IceGrid/TreeNode/ReplicaGroupEditor.java
index 6ffb4563cb9..a776f0e3023 100755
--- a/java/src/IceGrid/TreeNode/ReplicaGroupEditor.java
+++ b/java/src/IceGrid/TreeNode/ReplicaGroupEditor.java
@@ -117,7 +117,6 @@ class ReplicaGroupEditor extends Editor
//
// Restore all
//
- replicaGroup.restoreDescriptor(savedDescriptor);
try
{
replicaGroups.addChild(replicaGroup, true);
@@ -126,6 +125,7 @@ class ReplicaGroupEditor extends Editor
{
assert false;
}
+ replicaGroup.restoreDescriptor(savedDescriptor);
model.setSelectionPath(replicaGroup.getPath());
JOptionPane.showMessageDialog(