diff --git a/core/src/main/java/lucee/commons/lang/ExceptionUtil.java b/core/src/main/java/lucee/commons/lang/ExceptionUtil.java index f110d4f284..20fe40f5bb 100644 --- a/core/src/main/java/lucee/commons/lang/ExceptionUtil.java +++ b/core/src/main/java/lucee/commons/lang/ExceptionUtil.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.Iterator; +import lucee.print; import lucee.commons.io.SystemUtil.TemplateLine; import lucee.commons.io.res.Resource; import lucee.commons.io.res.util.ResourceUtil; @@ -325,6 +326,8 @@ public static void initCauseEL(Throwable e, Throwable cause) { e.initCause(cause); } catch (Exception ex) { + print.e("xxxxxxxxxxxx"); + print.e(ex); } } diff --git a/core/src/main/java/lucee/runtime/exp/PageRuntimeException.java b/core/src/main/java/lucee/runtime/exp/PageRuntimeException.java index 549cf03eba..b8746fbe49 100644 --- a/core/src/main/java/lucee/runtime/exp/PageRuntimeException.java +++ b/core/src/main/java/lucee/runtime/exp/PageRuntimeException.java @@ -18,6 +18,7 @@ **/ package lucee.runtime.exp; +import lucee.commons.lang.ExceptionUtil; import lucee.runtime.PageContext; import lucee.runtime.PageSource; import lucee.runtime.config.Config; @@ -41,17 +42,7 @@ public class PageRuntimeException extends RuntimeException implements IPageExcep public PageRuntimeException(Throwable t) { super(t.getMessage(), t); this.pe = Caster.toPageException(t); - } - - /** - * constructor of the class - * - * @param pe page exception to hold - */ - public PageRuntimeException(PageException pe) { - super(pe.getMessage(), pe); - setStackTrace(pe.getStackTrace()); - this.pe = pe; + ExceptionUtil.initCauseEL(this, t); } /** diff --git a/core/src/main/java/lucee/transformer/library/function/FunctionLibFunction.java b/core/src/main/java/lucee/transformer/library/function/FunctionLibFunction.java index cd92592b9e..24e0655bcc 100755 --- a/core/src/main/java/lucee/transformer/library/function/FunctionLibFunction.java +++ b/core/src/main/java/lucee/transformer/library/function/FunctionLibFunction.java @@ -428,7 +428,7 @@ public BIF getBIF() { } catch (Throwable t) { ExceptionUtil.rethrowIfNecessary(t); - throw new RuntimeException(t); + throw new PageRuntimeException(t); } } else { diff --git a/loader/build.xml b/loader/build.xml index 4549164558..bac1c48504 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index 1976f426f4..79f7ecd567 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.2.0.220-SNAPSHOT + 6.2.0.221-SNAPSHOT jar Lucee Loader Build