enjoy 3.3 release ^_^

src/main/java/com/jfinal/template/stat/Scope.java

@@ -90,8 +90,19 @@ public class Scope {
 	 */
 	public Object get(Object key) {
 		for (Scope cur=this; cur!=null; cur=cur.parent) {
-			if (cur.data != null && cur.data.containsKey(key)) {
-				return cur.data.get(key);
+//			if (cur.data != null && cur.data.containsKey(key)) {
+//				return cur.data.get(key);
+//			}
+			
+			if (cur.data != null) {
+				Object ret = cur.data.get(key);
+				if (ret != null) {
+					return ret;
+				}
+				
+				if (cur.data.containsKey(key)) {
+					return null;
+				}
 			}
 		}
 		// return null;
@@ -229,6 +240,18 @@ public class Scope {
 			}
 		}
 	}
+	
+	/**
+	 * 自内向外在作用域栈中查找变量是否存在
+	 */
+	public boolean exists(Object key) {
+		for (Scope cur=this; cur!=null; cur=cur.parent) {
+			if (cur.data != null && cur.data.containsKey(key)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }