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/Utils.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/Utils.java')
| -rwxr-xr-x | java/src/IceGrid/Utils.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/src/IceGrid/Utils.java b/java/src/IceGrid/Utils.java index ac51a6e2a16..1462bac2f9c 100755 --- a/java/src/IceGrid/Utils.java +++ b/java/src/IceGrid/Utils.java @@ -354,7 +354,15 @@ public class Utils //
_resolvedVariableCache.put(name, _recursiveDefError);
String result = _subResolver.substitute((String)obj);
- _resolvedVariableCache.put(name, result);
+ if(obj.equals(result))
+ {
+ _resolvedVariableCache.remove(name);
+ }
+ else
+ {
+ System.err.println("Caching: " + name + ": " + result);
+ _resolvedVariableCache.put(name, result);
+ }
return result;
}
else
|