From 1df6b6c09f8070a4bd742f641515a0516bbc36d2 Mon Sep 17 00:00:00 2001 From: Zac Spitzer Date: Mon, 11 Nov 2024 02:27:40 +0100 Subject: [PATCH] try with local 16, args 4 8 or 16 --- core/src/main/java/lucee/runtime/type/UDFImpl.java | 2 +- core/src/main/java/lucee/runtime/type/scope/LocalImpl.java | 2 +- core/src/main/java/lucee/runtime/type/scope/ScopeFactory.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/lucee/runtime/type/UDFImpl.java b/core/src/main/java/lucee/runtime/type/UDFImpl.java index efac8a2e9a..7c80e5fc02 100755 --- a/core/src/main/java/lucee/runtime/type/UDFImpl.java +++ b/core/src/main/java/lucee/runtime/type/UDFImpl.java @@ -305,7 +305,7 @@ private Object _call(PageContext pc, Collection.Key calledName, Object[] args, S boolean existingNewArgs = newArgs != null; if (!existingNewArgs){ - if (args == null) newArgs = pci.getScopeFactory().getArgumentInstance(); + if (args == null || args.length < 4) newArgs = pci.getScopeFactory().getArgumentInstance(); else newArgs = pci.getScopeFactory().getArgumentInstance(args.length); } newArgs.setFunctionArgumentNames(properties.getArgumentsSet()); diff --git a/core/src/main/java/lucee/runtime/type/scope/LocalImpl.java b/core/src/main/java/lucee/runtime/type/scope/LocalImpl.java index 8f42c0e398..329f041b78 100755 --- a/core/src/main/java/lucee/runtime/type/scope/LocalImpl.java +++ b/core/src/main/java/lucee/runtime/type/scope/LocalImpl.java @@ -28,7 +28,7 @@ public final class LocalImpl extends ScopeSupport implements Scope, Local { public LocalImpl() { // super("local", Scope.SCOPE_LOCAL, Struct.TYPE_SYNC, 4); - super("local", Scope.SCOPE_LOCAL, Struct.TYPE_REGULAR, 8); + super("local", Scope.SCOPE_LOCAL, Struct.TYPE_REGULAR, 16); } @Override diff --git a/core/src/main/java/lucee/runtime/type/scope/ScopeFactory.java b/core/src/main/java/lucee/runtime/type/scope/ScopeFactory.java index 76549a064f..948bb33382 100755 --- a/core/src/main/java/lucee/runtime/type/scope/ScopeFactory.java +++ b/core/src/main/java/lucee/runtime/type/scope/ScopeFactory.java @@ -56,7 +56,7 @@ public Argument getArgumentInstance(int size) { return arg; } //aprint.o("arguments new! " + arguments.size()); - return size > 3 ? new ArgumentImpl(8) : new ArgumentImpl(); + return size < 7 ? new ArgumentImpl(8) : new ArgumentImpl(16); } /**