Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeloffner committed Dec 9, 2024
1 parent b899778 commit fa4c58b
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fa4c58b

Please sign in to comment.