LDEV-5206 cleanup, avoid possible NPE

zspitzer · Dec 17, 2024 · e4af930 · e4af930
1 parent f554f2e
commit e4af930
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/core/src/main/java/lucee/runtime/engine/ConsoleExecutionLog.java b/core/src/main/java/lucee/runtime/engine/ConsoleExecutionLog.java
@@ -26,8 +26,8 @@
 import lucee.commons.io.res.util.ResourceSnippet;
 import lucee.commons.io.res.util.ResourceSnippetsMap;
 import lucee.runtime.PageContext;
+import lucee.runtime.PageSource;
 import lucee.runtime.PageContextImpl;
-import lucee.runtime.functions.math.Int;
 import lucee.runtime.op.Caster;
 
 public class ConsoleExecutionLog extends ExecutionLogSupport {
@@ -52,11 +52,12 @@ protected void _init(PageContext pc, Map<String, String> arguments) {
 
 	@Override
 	protected void _log(int startPos, int endPos, long startTime, long endTime) {
-
+		PageSource ps = pc.getCurrentPageSource(null);
+		if (ps == null) return;
 		long diff = endTime - startTime;
-		String log = pc.getId() + ":" + pc.getCurrentPageSource().getDisplayPath() + ":";
+		String log = pc.getId() + ":" + ps.getDisplayPath() + ":";
 		if (snippet) {
-			ResourceSnippet snippet = snippetsMap.getSnippet(pc.getCurrentPageSource(), startPos, endPos, ((PageContextImpl) pc).getResourceCharset().name());
+			ResourceSnippet snippet = snippetsMap.getSnippet(ps, startPos, endPos, ((PageContextImpl) pc).getResourceCharset().name());
 			log += positions(snippet.getEndLine(), snippet.getEndLine()) + " > " + timeLongToString(diff) + " [" + snippet.getContent() + "]";
 		} else {
 			log += positions(startPos, endPos) + " > " + timeLongToString(diff);