diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-04-11 14:55:57 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-04-11 14:55:57 +0000 |
| commit | f8d1c63bea083d8bc296fb77569038100b813c0d (patch) | |
| tree | dee556334c82e9937cb9543c45a8c0e9320babe6 /java/src/IceGridGUI/LiveDeployment/Node.java | |
| parent | Added back getifaddrs for Mac OS X Use poll() instead of select() on Unix (diff) | |
| download | ice-f8d1c63bea083d8bc296fb77569038100b813c0d.tar.bz2 ice-f8d1c63bea083d8bc296fb77569038100b813c0d.tar.xz ice-f8d1c63bea083d8bc296fb77569038100b813c0d.zip | |
Merge from 3.2 branch
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Node.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Node.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java index 794621e382c..ca2e4422e2c 100755 --- a/java/src/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/LiveDeployment/Node.java @@ -381,10 +381,23 @@ class Node extends ListTreeNode for(int i = 0; i < update.removeServers.length; ++i) { Server server = findServer(update.removeServers[i]); - removeDescriptor(nodeDesc, server); - int index = getIndex(server); - _children.remove(server); - getRoot().getTreeModel().nodesWereRemoved(this, new int[]{index}, new Object[]{server}); + if(server == null) + { + // + // This should never happen + // + String errorMsg = "LiveDeployment/Node: unable to remove server '" + update.removeServers[i] + + "'; please report this bug."; + + getCoordinator().getCommunicator().getLogger().error(errorMsg); + } + else + { + removeDescriptor(nodeDesc, server); + int index = getIndex(server); + _children.remove(server); + getRoot().getTreeModel().nodesWereRemoved(this, new int[]{index}, new Object[]{server}); + } } // |