fix default type defintion

zspitzer · Dec 9, 2024 · 16f9252 · 16f9252
1 parent 86c1fdf
commit 16f9252
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/core/src/main/java/lucee/runtime/functions/struct/StructNew.java b/core/src/main/java/lucee/runtime/functions/struct/StructNew.java
@@ -68,6 +68,14 @@ public static Struct call(PageContext pc, String type, UDF onMissingKey) throws
 	}
 
 	public static int toType(String type) throws ApplicationException {
+		int res = toType(type, Struct.TYPE_UNDEFINED);
+		if (res == Struct.TYPE_UNDEFINED)
+			throw new ApplicationException("valid struct types are [normal, weak, linked, soft, synchronized,ordered-casesensitive,casesensitive,max:<number>]");
+		return res;
+	}
+
+	public static int toType(String type, int defaultValue) {
+		if (type == null) return defaultValue;
 		type = type.toLowerCase();
 		if (type.equals("linked")) return Struct.TYPE_LINKED;
 		else if (type.equals("ordered")) return Struct.TYPE_LINKED;
@@ -82,7 +90,7 @@ public static int toType(String type) throws ApplicationException {
 		else if (type.equals("ordered-casesensitive")) return StructImpl.TYPE_LINKED_CASESENSITIVE;
 		else if (type.equals("casesensitive")) return StructImpl.TYPE_CASESENSITIVE;
 		else if (type.startsWith("max:")) return StructImpl.TYPE_MAX;
-		else throw new ApplicationException("valid struct types are [normal, weak, linked, soft, synchronized,ordered-casesensitive,casesensitive,max:<number>]");
+		else return defaultValue;
 
 	}
 

diff --git a/core/src/main/java/lucee/runtime/type/StructImpl.java b/core/src/main/java/lucee/runtime/type/StructImpl.java
@@ -43,7 +43,7 @@
 import lucee.runtime.dump.DumpProperties;
 import lucee.runtime.exp.ExpressionException;
 import lucee.runtime.exp.PageException;
-import lucee.runtime.op.Caster;
+import lucee.runtime.functions.struct.StructNew;
 import lucee.runtime.op.Duplicator;
 import lucee.runtime.op.ThreadLocalDuplication;
 import lucee.runtime.type.it.StringIterator;
@@ -71,7 +71,7 @@ public class StructImpl extends StructSupport {
 	public static final int DEFAULT_TYPE;
 
 	static {
-		DEFAULT_TYPE = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.struct.type", null), TYPE_REGULAR);
+		DEFAULT_TYPE = StructNew.toType(SystemUtil.getSystemPropOrEnvVar("lucee.struct.type", null), TYPE_REGULAR);
 	}
 
 	/**

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.2.0.193-SNAPSHOT"/>
+  <property name="version" value="6.2.0.194-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.2.0.193-SNAPSHOT</version>
+  <version>6.2.0.194-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>