LDEV-5052 - add alias for other name

lucee · Aug 26, 2024 · ca26101 · ca26101
1 parent 3e30426
commit ca26101
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.1.75-SNAPSHOT"/>
+  <property name="version" value="6.1.1.76-SNAPSHOT"/>
 
   <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.1.75-SNAPSHOT</version>
+  <version>6.1.1.76-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>