shortcut the test (#1269)

Co-authored-by: wcekan <wcekan@verizonmedia.com>
yahoo · Apr 17, 2020 · d2fefd4 · d2fefd4
1 parent f492cec
commit d2fefd4
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifier.java b/...-core/src/main/java/com/yahoo/elide/core/filter/expression/InMemoryExecutionVerifier.java
@@ -37,16 +37,18 @@ public Boolean visitPredicate(FilterPredicate filterPredicate) {
 
     @Override
     public Boolean visitAndExpression(AndFilterExpression expression) {
-        Boolean left = expression.getLeft().accept(this);
-        Boolean right = expression.getRight().accept(this);
-        return (left || right);
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        // is either computed?
+        return (left.accept(this) || right.accept(this));
     }
 
     @Override
     public Boolean visitOrExpression(OrFilterExpression expression) {
-        Boolean left = expression.getLeft().accept(this);
-        Boolean right = expression.getRight().accept(this);
-        return (left || right);
+        FilterExpression left = expression.getLeft();
+        FilterExpression right = expression.getRight();
+        // is either computed?
+        return (left.accept(this) || right.accept(this));
     }
 
     @Override