diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-06-07 01:27:46 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-06-07 01:27:46 +0000 |
| commit | 507d0238a050ef9726ab95a646e4cc9abca3fdd8 (patch) | |
| tree | ebbdb68e3a63441fe9ac8b9d1e646ab8b7688228 /java/src/IceGridGUI/LiveDeployment/Node.java | |
| parent | Simplified to take advantage of property sets (diff) | |
| download | ice-507d0238a050ef9726ab95a646e4cc9abca3fdd8.tar.bz2 ice-507d0238a050ef9726ab95a646e4cc9abca3fdd8.tar.xz ice-507d0238a050ef9726ab95a646e4cc9abca3fdd8.zip | |
Fixed various bugs.
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Node.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Node.java | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java index aa652a659ee..7ec19533761 100755 --- a/java/src/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/LiveDeployment/Node.java @@ -179,8 +179,8 @@ class Node extends ListTreeNode update.variables,
update.serverInstances,
update.servers,
- update.loadFactor.value,
- update.description.value,
+ update.loadFactor == null ? "" : update.loadFactor.value,
+ update.description == null ? "" : update.description.value,
update.propertySets);
appDesc.nodes.put(_id, nodeDesc);
@@ -280,6 +280,29 @@ class Node extends ListTreeNode java.util.Set serverTemplates)
{
ApplicationData data = (ApplicationData)_map.get(appDesc.name);
+
+ if(data == null)
+ {
+ if(update != null)
+ {
+ NodeDescriptor nodeDesc = new NodeDescriptor(
+ update.variables,
+ update.serverInstances,
+ update.servers,
+ update.loadFactor == null ? "" : update.loadFactor.value,
+ update.description == null ? "" : update.description.value,
+ update.propertySets);
+
+ appDesc.nodes.put(_id, nodeDesc);
+ add(appDesc, nodeDesc);
+ }
+ //
+ // Else, nothing to do.
+ //
+
+ return;
+ }
+
NodeDescriptor nodeDesc = data.descriptor;
java.util.Set freshServers = new java.util.HashSet();
|