Fixed bug #586

1 files changed, 26 insertions, 1 deletions

diff --git a/java/src/IceGrid/TreeNode/ServerTemplates.java b/java/src/IceGrid/TreeNode/ServerTemplates.java
index c99f024082d..8366439b631 100755
--- a/java/src/IceGrid/TreeNode/ServerTemplates.java
+++ b/java/src/IceGrid/TreeNode/ServerTemplates.java
@@ -189,7 +189,8 @@ class ServerTemplates extends Templates
 	return getApplication().findServerInstances(templateId);

     }

 

-    void update(java.util.Map updates, String[] removeTemplates)

+    void update(java.util.Map updates, String[] removeTemplates, 

+		java.util.Set serviceTemplates)

 	throws UpdateFailedException

     {

 	//

@@ -229,6 +230,30 @@ class ServerTemplates extends Templates
 	    }

 	}

 	

+	//

+	// Rebuild template affected by service template updates

+	//

+	p = serviceTemplates.iterator();

+	while(p.hasNext())

+	{

+	    java.util.List serviceInstances = 

+		findServiceInstances((String)p.next());

+	    java.util.Iterator q = serviceInstances.iterator();

+	    while(q.hasNext())

+	    {

+		Service service = (Service)q.next();

+		ServerTemplate serverTemplate = 

+		    (ServerTemplate)service.getParent().getParent();

+		

+		if(!updatedChildren.contains(serverTemplate) &&

+		   !newChildren.contains(serverTemplate))

+		{

+		    serverTemplate.rebuild();

+		    updatedChildren.add(serverTemplate);

+		}

+	    }

+	}

+	

 	updateChildren((CommonBaseI[])updatedChildren.toArray

 		       (new CommonBaseI[0]));

 	addChildren((CommonBaseI[])newChildren.toArray(new CommonBaseI[0]));