The LiveDeployment pane now handles property sets correctly

1 files changed, 11 insertions, 1 deletions

diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/LiveDeployment/Root.java
index d50fc0af7eb..7dc2766f82e 100755
--- a/java/src/IceGridGUI/LiveDeployment/Root.java
+++ b/java/src/IceGridGUI/LiveDeployment/Root.java
@@ -143,6 +143,10 @@ public class Root extends ListTreeNode
 	//

 	// Update only descriptors (no tree node shown in this view)

 	//

+	appDesc.propertySets.keySet().

+	    removeAll(java.util.Arrays.asList(update.removePropertySets));

+	appDesc.propertySets.putAll(update.propertySets);

+

 	for(int i = 0; i < update.removeReplicaGroups.length; ++i)

 	{

 	    for(int j = 0; j < appDesc.replicaGroups.size(); ++j)

@@ -164,7 +168,6 @@ public class Root extends ListTreeNode
 	    removeAll(java.util.Arrays.asList(update.removeServerTemplates));

 	appDesc.serverTemplates.putAll(update.serverTemplates);

 

-

 	//

 	// Nodes

 	//

@@ -327,6 +330,13 @@ public class Root extends ListTreeNode
 	return this;

     }

 

+    PropertySetDescriptor findNamedPropertySet(String name, String applicationName)

+    {

+	ApplicationDescriptor descriptor = (ApplicationDescriptor)

+	    _descriptorMap.get(applicationName);

+	return (PropertySetDescriptor)descriptor.propertySets.get(name);

+    }

+

     private Node findNode(String nodeName)

     {

 	return (Node)find(nodeName, _children);