diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-10-18 13:10:35 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-10-18 13:10:35 +0000 |
| commit | 205e7adf07785e57d97f94811c50953892106ceb (patch) | |
| tree | 8d914fceeb92784632962cd8cb0be79dd133a5c3 /java/src | |
| parent | Added some IceGrid .Net features. (diff) | |
| download | ice-205e7adf07785e57d97f94811c50953892106ceb.tar.bz2 ice-205e7adf07785e57d97f94811c50953892106ceb.tar.xz ice-205e7adf07785e57d97f94811c50953892106ceb.zip | |
Fixed NPE is Server.restoreDescriptor
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/AbstractServerEditor.java | 5 | ||||
| -rwxr-xr-x | java/src/IceGrid/TreeNode/ReplicaGroupEditor.java | 2 |
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( |