Merge pull request #22 from tominsam/master

allow inner null values to mask parent context values
This commit is contained in:
Michael Bayne
2012-12-04 16:38:13 -08:00
3 changed files with 12 additions and 5 deletions
@@ -141,10 +141,6 @@ public class Template
Object value = getValueIn(ctx.data, name, line);
if (value == NO_FETCHER_FOUND) {
// preserve variableMissing
} else if (value == null) {
// we found a fetcher, and it returned null; so we keep searching our parents, but
// we won't freak out about a missing variable if we have a nullValue configured
variableMissing = false;
} else {
return value;
}