Merge branch 'master' into patch-1

hyperjumptech · Aug 16, 2023 · 35576b4 · 35576b4
2 parents 50bb2d6 + d368b53
commit 35576b4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ast/RuleEntry.go b/ast/RuleEntry.go
@@ -157,10 +157,15 @@ func (e *RuleEntry) SetGrlText(grlText string) {
 }
 
 // Evaluate will evaluate this AST graph for when scope evaluation
-func (e *RuleEntry) Evaluate(ctx context.Context, dataContext IDataContext, memory *WorkingMemory) (bool, error) {
+func (e *RuleEntry) Evaluate(ctx context.Context, dataContext IDataContext, memory *WorkingMemory) (can bool, err error) {
 	if ctx.Err() != nil {
 		return false, ctx.Err()
 	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = fmt.Errorf("Error while evaluating rule %s, panic recovered", e.RuleName)
+		}
+	}()
 	if e.Retracted {
 		return false, nil
 	}