From fa4c58bcdb9ffc511605c32511b87e48bfbf3e37 Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Mon, 9 Dec 2024 22:34:57 +0100
Subject: [PATCH] fix merge conflict

---
 .../java/lucee/runtime/reflection/pairs/MethodInstance.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/lucee/runtime/reflection/pairs/MethodInstance.java b/core/src/main/java/lucee/runtime/reflection/pairs/MethodInstance.java
index a35d37ab2e..7ce66a8f15 100644
--- a/core/src/main/java/lucee/runtime/reflection/pairs/MethodInstance.java
+++ b/core/src/main/java/lucee/runtime/reflection/pairs/MethodInstance.java
@@ -67,8 +67,10 @@ else if (args.length == 1 && "equals".equals(methodName.getString())) {
 			return ((BiFunction<Object, Object, Object>) getResult().getValue()).apply(o, args);
 		}
 		catch (IncompatibleClassChangeError | ClassFormatError | ClassCastException e) { // java.lang.ClassCastException
+			print.e("-------------------------");
 			print.e(e);
-			if (!Clazz.allowReflection()) throw e;
+			print.e("-------------------------");
+			// if (!Clazz.allowReflection()) throw e;
 			LogUtil.log("dynamic", e);
 			DynamicInvoker di = DynamicInvoker.getExistingInstance();
 			lucee.transformer.dynamic.meta.Method method = Clazz.getMethodMatch(di.getClazz(clazz, true), methodName, args, true, true);