Stop looping on eq failure

sourcenetwork · Jun 28, 2022 · c539992 · c539992
1 parent 61a2065
commit c539992
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/connor/eq.go b/connor/eq.go
@@ -38,17 +38,16 @@ func eq(condition, data interface{}) (bool, error) {
 	case map[FilterKey]interface{}:
 		m := true
 		for prop, cond := range cn {
-			if !m {
-				// No need to evaluate after we fail
-				continue
-			}
-
-			mm, err := matchWith(prop.GetOperatorOrDefault("_eq"), cond, prop.GetProp(data))
+			var err error
+			m, err = matchWith(prop.GetOperatorOrDefault("_eq"), cond, prop.GetProp(data))
 			if err != nil {
 				return false, err
 			}
 
-			m = m && mm
+			if !m {
+				// No need to evaluate after we fail
+				break
+			}
 		}
 
 		return m, nil