fix for equals call on closure-proxy

wizzardo · May 25, 2024 · c7c14ed · c7c14ed
1 parent 8046bd6
commit c7c14ed
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/tools-evaluation/src/main/java/com/wizzardo/tools/evaluation/Function.java b/modules/tools-evaluation/src/main/java/com/wizzardo/tools/evaluation/Function.java
@@ -924,7 +924,8 @@ public Object invoke(Object proxy, Method method, Object[] args) {
 //                            closureArgs[j].set(args[j]);
 //                        }
                         if (args.length == 1 && method.getName().equals("equals")) {
-                            return closure.equals(args[0]);
+                            Object other = args[0];
+                            return other != null && other.equals(closure);
                         } else if (args.length == 0 && method.getName().equals("hashCode")) {
                             return closure.hashCode();
                         } else if (args.length == 0 && method.getName().equals("toString")) {