From ca261011de5976815bac6235e14f3dba552db382 Mon Sep 17 00:00:00 2001 From: michaeloffner Date: Mon, 26 Aug 2024 19:14:20 +0200 Subject: [PATCH] LDEV-5052 - add alias for other name --- .../main/java/lucee/runtime/config/ConfigWebFactory.java | 7 +++++-- loader/build.xml | 2 +- loader/pom.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java index 7e72a187e1..36ff06b3d4 100644 --- a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java +++ b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java @@ -2562,8 +2562,10 @@ private static void _loadCache(ConfigServerImpl configServer, ConfigImpl config, for (int i = 0; i < ConfigPro.CACHE_TYPES_MAX.length; i++) { try { String def = getAttr(defaultCache, "default" + StringUtil.ucFirst(ConfigPro.STRING_CACHE_TYPES_MAX[i])); - if (hasAccess && !StringUtil.isEmpty(def)) { - config.setCacheDefaultConnectionName(ConfigPro.CACHE_TYPES_MAX[i], def); + if (StringUtil.isEmpty(def, true)) def = getAttr(root, "cacheDefault" + StringUtil.ucFirst(ConfigPro.STRING_CACHE_TYPES_MAX[i])); + + if (hasAccess && !StringUtil.isEmpty(def, true)) { + config.setCacheDefaultConnectionName(ConfigPro.CACHE_TYPES_MAX[i], def.trim()); } else if (hasCS) { if (defaultCache.containsKey("default" + StringUtil.ucFirst(ConfigPro.STRING_CACHE_TYPES_MAX[i]))) @@ -2580,6 +2582,7 @@ else if (hasCS) { log(config, log, t); } } + { Struct eCaches = ConfigWebUtil.getAsStruct("caches", root); diff --git a/loader/build.xml b/loader/build.xml index 829e9f5643..54300fbeb4 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index 2113442221..b50004fa33 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.1.1.75-SNAPSHOT + 6.1.1.76-SNAPSHOT jar Lucee Loader Build