1 files changed, 13 insertions, 3 deletions
diff --git a/java/src/IceGrid/TreeNode/ServiceTemplate.java b/java/src/IceGrid/TreeNode/ServiceTemplate.java
index 109334cd7a0..775a688ed39 100755
--- a/java/src/IceGrid/TreeNode/ServiceTemplate.java
+++ b/java/src/IceGrid/TreeNode/ServiceTemplate.java
@@ -14,8 +14,19 @@ class ServiceTemplate extends Parent
 {
     ServiceTemplate(String name, TemplateDescriptor descriptor)
     {
-	_name = name;
+	super(name);
+	rebuild(descriptor);
+    }
+
+     void rebuild(TemplateDescriptor descriptor)
+    {
 	_descriptor = descriptor;
+	clearChildren();
+
+	//
+	// Fix-up parameters order
+	//
+	java.util.Collections.sort(_descriptor.parameters);
 	
 	_adapters = new Adapters(_descriptor.descriptor.adapters, true);
 	addChild(_adapters);
@@ -26,10 +37,9 @@ class ServiceTemplate extends Parent
 
     public String toString()
     {
-	return templateLabel(_name, _descriptor.parameters);
+	return templateLabel(_id, _descriptor.parameters);
     }
 
-    private String _name;
     private TemplateDescriptor _descriptor;
     private Adapters _adapters;
     private DbEnvs _dbEnvs;