enjoy 3.3 release ^_^

src/main/java/com/jfinal/template/expr/ast/NullSafe.java

@@ -49,15 +49,18 @@ public class NullSafe extends Expr {
 		Ctrl ctrl = scope.getCtrl();
 		boolean oldNullSafeValue = ctrl.isNullSafe();
 		
-		Object ret;
 		try {
 			ctrl.setNullSafe(true);
-			ret = left.eval(scope);
+			Object ret = left.eval(scope);
+			if (ret != null) {
+				return ret;
+			}
 		} finally {
 			ctrl.setNullSafe(oldNullSafeValue);
 		}
 		
-		return ret == null && right != null ? right.eval(scope) : ret;
+		// right 表达式处于 null safe 区域之外
+		return right != null ? right.eval(scope) : null;
 	}
 }
 
@@ -66,3 +69,4 @@ public class NullSafe extends Expr {
 
 
 
+