summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/Application/Nodes.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2007-06-11 14:01:30 +0800
committerMatthew Newhook <matthew@zeroc.com>2007-06-11 14:01:30 +0800
commit65b26c51781207fbeba685a4e3f75a796ac3a798 (patch)
treed612f15e31bca110a2f926b62c9694c5b793cc74 /java/src/IceGridGUI/Application/Nodes.java
parentmore clean stuff (diff)
downloadice-65b26c51781207fbeba685a4e3f75a796ac3a798.tar.bz2
ice-65b26c51781207fbeba685a4e3f75a796ac3a798.tar.xz
ice-65b26c51781207fbeba685a4e3f75a796ac3a798.zip
Merged Bernards change for http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2204.
Diffstat (limited to 'java/src/IceGridGUI/Application/Nodes.java')
-rwxr-xr-xjava/src/IceGridGUI/Application/Nodes.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/Application/Nodes.java b/java/src/IceGridGUI/Application/Nodes.java
index 5da3acee87d..5bfeab237f4 100755
--- a/java/src/IceGridGUI/Application/Nodes.java
+++ b/java/src/IceGridGUI/Application/Nodes.java
@@ -224,8 +224,8 @@ class Nodes extends ListTreeNode
NodeDescriptor nodeDescriptor = new NodeDescriptor(update.variables,
update.serverInstances,
update.servers,
- update.loadFactor.value,
- update.description.value,
+ update.loadFactor == null ? "" : update.loadFactor.value,
+ update.description == null ? "" : update.description.value,
new java.util.HashMap());
_descriptors.put(update.name, nodeDescriptor);
node = new Node(false, this, update.name, nodeDescriptor);