LDEV-2230 - improve getting template path

lucee · Feb 9, 2024 · 6612b5d · 6612b5d
1 parent 22b38f0
commit 6612b5d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/core/src/main/java/lucee/runtime/exp/PageExceptionImpl.java b/core/src/main/java/lucee/runtime/exp/PageExceptionImpl.java
@@ -594,27 +594,38 @@ public static String toString(PageContext pc, StackTraceElement trace) {
 		if (trace.getFileName() == null || trace.getFileName().endsWith(".java")) return trace.toString();
 		Config config = ThreadLocalPageContext.getConfig(pc);
 		if (config != null) {
-			Resource res = pc.getConfig().getResource(trace.getFileName());
-			if (res.exists()) path = trace.getFileName();
-
-			// get path from source
-			if (path == null) {
-				SourceInfo si = MappingUtil.getMatch(pc, trace);
-				if (si != null) {
-					if (si.absolutePath(pc) != null) {
-						res = pc.getConfig().getResource(si.absolutePath(pc));
-						if (res.exists()) path = si.absolutePath(pc);
-					}
-					if (path == null && si.relativePath != null) path = si.relativePath;
-				}
-				if (path == null) path = trace.getFileName();
-			}
+			path = abs((PageContextImpl) pc, config, trace.getFileName());
+			/*
+			 * Resource res = pc.getConfig().getResource(trace.getFileName()); if (res.exists()) path =
+			 * trace.getFileName();
+			 * 
+			 * // get path from source if (path == null) { SourceInfo si = MappingUtil.getMatch(pc, trace); if
+			 * (si != null) { if (si.absolutePath(pc) != null) { res =
+			 * pc.getConfig().getResource(si.absolutePath(pc)); if (res.exists()) path = si.absolutePath(pc); }
+			 * if (path == null && si.relativePath != null) path = si.relativePath; } if (path == null) path =
+			 * trace.getFileName(); }
+			 */
 		}
 		return trace.getClassName() + "." + trace.getMethodName() + (trace.isNativeMethod() ? "(Native Method)"
 				: (path != null && trace.getLineNumber() >= 0 ? "(" + path + ":" + trace.getLineNumber() + ")" : (path != null ? "(" + path + ")" : "(Unknown Source)")));
 
 	}
 
+	private static String abs(PageContextImpl pci, Config config, String template) {
+
+		Resource res = config.getResource(template);
+		if (res.exists()) return template;
+
+		PageSource ps = pci == null ? null : pci.getPageSource(template);
+		res = ps == null ? null : ps.getPhyscalFile();
+		if (res == null || !res.exists()) {
+			res = config.getResource(ps.getDisplayPath());
+			if (res != null && res.exists()) return res.getAbsolutePath();
+		}
+		else return res.getAbsolutePath();
+		return template;
+	}
+
 	private static StackTraceElement[] getStackTraceElements(Throwable t) {
 		StackTraceElement[] st = getStackTraceElements(t, true);
 		if (st == null) st = getStackTraceElements(t, false);

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.0.29-BETA"/>
+  <property name="version" value="6.1.0.30-BETA"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.0.29-BETA</version>
+  <version>6.1.0.30-BETA</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>