diff options
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/ServerInstance.java | 13 | ||||
| -rwxr-xr-x | java/src/IceGrid/TreeNode/ServiceInstance.java | 16 |
2 files changed, 21 insertions, 8 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;
}
diff --git a/java/src/IceGrid/TreeNode/ServiceInstance.java b/java/src/IceGrid/TreeNode/ServiceInstance.java index c0d538168e2..55d333115f6 100755 --- a/java/src/IceGrid/TreeNode/ServiceInstance.java +++ b/java/src/IceGrid/TreeNode/ServiceInstance.java @@ -32,13 +32,21 @@ class ServiceInstance extends Parent public String toString()
{
String result = "";
+
+ //
+ // The if Temporary
+ //
if(_descriptor.descriptor != null)
{
- result = _descriptor.descriptor.name + ": ";
+ result = _descriptor.descriptor.name;
+ }
+
+ if(_templateDescriptor != null)
+ {
+ result += ": " + templateLabel(_descriptor.template,
+ _templateDescriptor.parameters,
+ _descriptor.parameterValues);
}
- result += templateLabel(_descriptor.template,
- _templateDescriptor.parameters,
- _descriptor.parameterValues);
return result;
}
|