diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-06-21 16:54:28 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-06-21 16:54:28 +0000 |
| commit | f0c8055d63b0cb7bb58e18ecbe554761a78e6d90 (patch) | |
| tree | 0a097fa4e5e9eac50f7e003572d18c1da44fc3f4 /java/src/IceGrid/TreeNode/ServerInstance.java | |
| parent | Fixes (diff) | |
| download | ice-f0c8055d63b0cb7bb58e18ecbe554761a78e6d90.tar.bz2 ice-f0c8055d63b0cb7bb58e18ecbe554761a78e6d90.tar.xz ice-f0c8055d63b0cb7bb58e18ecbe554761a78e6d90.zip | |
Fix for template-less instances
Diffstat (limited to 'java/src/IceGrid/TreeNode/ServerInstance.java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/ServerInstance.java | 13 |
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;
}
|