diff options
author | Bernard Normier <bernard@zeroc.com> | 2006-02-21 20:57:26 +0000 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2006-02-21 20:57:26 +0000 |
commit | 613a6c85a495db60718b64d0b5da1d4f2f97c266 (patch) | |
tree | 5c2a16abc837d7dcd7759e396eb7e645450547a7 /java/src/IceGrid/TreeNode/Node.java | |
parent | Use ["cpp:array"] for byte seq (diff) | |
download | ice-613a6c85a495db60718b64d0b5da1d4f2f97c266.tar.bz2 ice-613a6c85a495db60718b64d0b5da1d4f2f97c266.tar.xz ice-613a6c85a495db60718b64d0b5da1d4f2f97c266.zip |
Partial fix for variable substitution problem
Diffstat (limited to 'java/src/IceGrid/TreeNode/Node.java')
-rwxr-xr-x | java/src/IceGrid/TreeNode/Node.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/java/src/IceGrid/TreeNode/Node.java b/java/src/IceGrid/TreeNode/Node.java index 0047f3b5128..f85e0529342 100755 --- a/java/src/IceGrid/TreeNode/Node.java +++ b/java/src/IceGrid/TreeNode/Node.java @@ -1060,9 +1060,16 @@ class Node extends EditableParent _origDescription = _descriptor.description;
_origLoadFactor = _descriptor.loadFactor;
- _resolver = new Utils.Resolver(new java.util.Map[]
- {_descriptor.variables, application.getVariables()});
-
+
+ java.util.Map[] maps = new java.util.Map[]
+ {_descriptor.variables, application.getVariables()};
+
+ assert maps[0] == _descriptor.variables;
+ assert maps[1] == application.getVariables();
+
+
+ _resolver = new Utils.Resolver(maps);
+
_resolver.put("application", application.getId());
_resolver.put("node", getId());
|