From cb56f9d12ccdf2bf23c58204fbf73278491f56c5 Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Wed, 15 Nov 2023 14:38:29 +0100
Subject: [PATCH] clean up

---
 core/src/main/java/lucee/runtime/config/ConfigImpl.java    | 3 +--
 .../main/java/lucee/runtime/config/ConfigWebFactory.java   | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/lucee/runtime/config/ConfigImpl.java b/core/src/main/java/lucee/runtime/config/ConfigImpl.java
index 43d46b870d..f583607979 100755
--- a/core/src/main/java/lucee/runtime/config/ConfigImpl.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigImpl.java
@@ -69,7 +69,6 @@
 import lucee.commons.lang.types.RefBoolean;
 import lucee.commons.net.IPRange;
 import lucee.loader.engine.CFMLEngine;
-import lucee.loader.util.Util;
 import lucee.runtime.CIPage;
 import lucee.runtime.Component;
 import lucee.runtime.Mapping;
@@ -3980,7 +3979,7 @@ protected void setPreciseMath(boolean preciseMath) {
 	}
 
 	protected void setMainLogger(String mainLoggerName) {
-		if (!Util.isEmpty(mainLoggerName, true)) this.mainLoggerName = mainLoggerName.trim();
+		if (!StringUtil.isEmpty(mainLoggerName, true)) this.mainLoggerName = mainLoggerName.trim();
 	}
 
 	@Override
diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
index 173b0b0a53..32b7fbdbbf 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
@@ -57,6 +57,7 @@
 import org.xml.sax.SAXException;
 
 import lucee.Info;
+import lucee.print;
 import lucee.commons.collection.MapFactory;
 import lucee.commons.date.TimeZoneConstants;
 import lucee.commons.date.TimeZoneUtil;
@@ -83,7 +84,6 @@
 import lucee.commons.lang.StringUtil;
 import lucee.commons.net.URLDecoder;
 import lucee.loader.engine.CFMLEngine;
-import lucee.loader.util.Util;
 import lucee.runtime.CFMLFactoryImpl;
 import lucee.runtime.Component;
 import lucee.runtime.Mapping;
@@ -2026,7 +2026,7 @@ private static void _loadLoggers(ConfigServerImpl configServer, ConfigImpl confi
 
 			// main logger
 			String mainLogger = ConfigWebUtil.getAsString("mainLogger", root, null);
-			if (!Util.isEmpty(mainLogger, true)) {
+			if (!StringUtil.isEmpty(mainLogger, true)) {
 				config.setMainLogger(mainLogger.trim());
 			}
 			else if (hasCS) {
@@ -2034,7 +2034,7 @@ else if (hasCS) {
 			}
 			else {
 				mainLogger = SystemUtil.getSystemPropOrEnvVar("lucee.logging.main", null);
-				if (Util.isEmpty(mainLogger, true)) config.setMainLogger(mainLogger.trim());
+				if (StringUtil.isEmpty(mainLogger, true)) config.setMainLogger(mainLogger.trim());
 			}
 
 			// loggers
@@ -2119,6 +2119,7 @@ else if (!cdLayout.isBundle()) {
 			}
 		}
 		catch (Throwable t) {
+			print.e(t);
 			ExceptionUtil.rethrowIfNecessary(t);
 			log(config, null, t);
 		}