Skip to content

Commit

Permalink
Merge branch '6.2' of https://github.com/lucee/Lucee into 6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeloffner committed Dec 16, 2024
2 parents f965144 + af05603 commit f51d2d8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion core/src/main/java/lucee/runtime/functions/closure/Each.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@

public final class Each extends BIF implements ClosureFunc {

public static final int DEFAULT_MAX_THREAD = 20;
public static final int DEFAULT_MAX_THREAD = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.threads.maxDefault", null), 20);

private static final long serialVersionUID = 1955185705863596525L;

public static String call(PageContext pc, Object obj, UDF udf) throws PageException {
Expand Down
5 changes: 5 additions & 0 deletions core/src/main/java/resource/setting/sysprop-envvar.json
Original file line number Diff line number Diff line change
Expand Up @@ -391,5 +391,10 @@
"sysprop": "lucee.cache.variableKeys",
"envvar": "LUCEE_CACHE_VARIABLEKEYS",
"desc": "Sets the max number of variable names (keys) to cache"
},
{
"sysprop": "lucee.threads.maxDefault",
"envvar": "LUCEE_THREADS_MAXDEFAULT",
"desc": "Sets the default max number of parallel threads, default 20"
}
]

0 comments on commit f51d2d8

Please sign in to comment.