Merge pull request #22 from tominsam/master

allow inner null values to mask parent context values

src/main/java/com/samskivert/mustache/BasicCollector.java

@@ -41,7 +41,11 @@ public abstract class BasicCollector implements Mustache.Collector
 
     protected static final Mustache.VariableFetcher MAP_FETCHER = new Mustache.VariableFetcher() {
         public Object get (Object ctx, String name) throws Exception {
-            return ((Map<?,?>)ctx).get(name);
+            if (((Map<?,?>)ctx).containsKey(name)) {
+                return ((Map<?,?>)ctx).get(name);
+            } else {
+                return Template.NO_FETCHER_FOUND;
+            }
         }
     };
 

src/main/java/com/samskivert/mustache/Template.java

@@ -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;
             }