summaryrefslogtreecommitdiff
path: root/java/src/IceGrid/TreeNode/Application.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-11-08 19:51:53 +0000
committerBernard Normier <bernard@zeroc.com>2005-11-08 19:51:53 +0000
commit01a5e905cb352901a9aeef1e6328f581fe77a267 (patch)
treee1fd65505a37ba34db97cb6bd5d85df607f06d7a /java/src/IceGrid/TreeNode/Application.java
parentminor fixes to comments (diff)
downloadice-01a5e905cb352901a9aeef1e6328f581fe77a267.tar.bz2
ice-01a5e905cb352901a9aeef1e6328f581fe77a267.tar.xz
ice-01a5e905cb352901a9aeef1e6328f581fe77a267.zip
Fixed bug #586
Diffstat (limited to 'java/src/IceGrid/TreeNode/Application.java')
-rwxr-xr-xjava/src/IceGrid/TreeNode/Application.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java
index 01f6ebf6e68..4c384cca369 100755
--- a/java/src/IceGrid/TreeNode/Application.java
+++ b/java/src/IceGrid/TreeNode/Application.java
@@ -540,7 +540,7 @@ public class Application extends EditableParent
}
//
- // Replicated adapters
+ // Replica groups
//
for(int i = 0; i < desc.removeReplicaGroups.length; ++i)
{
@@ -573,7 +573,8 @@ public class Application extends EditableParent
}
_descriptor.serverTemplates.putAll(desc.serverTemplates);
_serverTemplates.update(desc.serverTemplates,
- desc.removeServerTemplates);
+ desc.removeServerTemplates,
+ desc.serviceTemplates.keySet());
//
// Nodes
@@ -585,7 +586,10 @@ public class Application extends EditableParent
//
// Updates also _descriptor.nodes
//
- _nodes.update(desc.nodes, desc.removeNodes);
+ _nodes.update(desc.nodes, desc.removeNodes,
+ desc.serverTemplates.keySet(),
+ desc.serviceTemplates.keySet());
+
}
ServerTemplate findServerTemplate(String id)