summaryrefslogtreecommitdiff
path: root/java/src/IceGrid/TreeNode/ServerInstance.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceGrid/TreeNode/ServerInstance.java')
-rwxr-xr-xjava/src/IceGrid/TreeNode/ServerInstance.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/java/src/IceGrid/TreeNode/ServerInstance.java b/java/src/IceGrid/TreeNode/ServerInstance.java
index ce2fd3899b3..8c204b8c5f7 100755
--- a/java/src/IceGrid/TreeNode/ServerInstance.java
+++ b/java/src/IceGrid/TreeNode/ServerInstance.java
@@ -140,10 +140,15 @@ class ServerInstance extends Parent
public String toString()
{
- String result = _descriptor.descriptor.name + ": ";
- result += templateLabel(_descriptor.template,
- _templateDescriptor.parameters,
- _descriptor.parameterValues);
+ String result = _descriptor.descriptor.name;
+
+ if(_templateDescriptor != null)
+ {
+
+ result += ": " + templateLabel(_descriptor.template,
+ _templateDescriptor.parameters,
+ _descriptor.parameterValues);
+ }
return result;
}