diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-10-08 18:44:20 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-10-08 18:44:20 -0400 |
| commit | c9a745d7edd8d42df5fe389119950d62651a5df9 (patch) | |
| tree | b042958d64c83e2b6b71ad19fd2e31ee0e736f1d /java/src/IceGridGUI/LiveDeployment/Node.java | |
| parent | vsaddin minor fixes (diff) | |
| download | ice-c9a745d7edd8d42df5fe389119950d62651a5df9.tar.bz2 ice-c9a745d7edd8d42df5fe389119950d62651a5df9.tar.xz ice-c9a745d7edd8d42df5fe389119950d62651a5df9.zip | |
Fixed ICE-5495: incorrect substitution when both node and application define same variable
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Node.java')
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/Node.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java index 80fe45b3435..3cfbb4a003a 100644 --- a/java/src/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/LiveDeployment/Node.java @@ -344,7 +344,7 @@ class Node extends ListTreeNode ApplicationData data = new ApplicationData(); data.descriptor = nodeDesc; @SuppressWarnings("unchecked") - Utils.Resolver resolver = new Utils.Resolver(new java.util.Map[]{appDesc.variables, nodeDesc.variables}); + Utils.Resolver resolver = new Utils.Resolver(new java.util.Map[]{nodeDesc.variables, appDesc.variables}); data.resolver = resolver; data.resolver.put("application", appDesc.name); data.resolver.put("node", _id); |