improve argument handling

lucee · Oct 4, 2023 · 01abe67 · 01abe67
1 parent e3fed8c
commit 01abe67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/source/java/src/org/lucee/extension/resource/s3/function/S3GetACL.java b/source/java/src/org/lucee/extension/resource/s3/function/S3GetACL.java
@@ -39,10 +39,9 @@ public Object invoke(PageContext pc, Object[] args) throws PageException {
 
  // required
  String bucketName = cast.toString(args[0]);
- String objectName = cast.toString(args[1]);
- if (isEmpty(objectName)) objectName = null;
 
  // optional
+ String objectName = args.length > 1 && !isEmpty(args[1]) ? cast.toString(args[1]) : null;
  String accessKeyId = args.length > 2 && args[2] != null ? cast.toString(args[2]) : null;
  String secretAccessKey = args.length > 3 && args[3] != null ? cast.toString(args[3]) : null;
  String host = args.length > 4 && args[4] != null ? cast.toString(args[4]) : null;

diff --git a/source/java/src/org/lucee/extension/resource/s3/function/S3GetMetaData.java b/source/java/src/org/lucee/extension/resource/s3/function/S3GetMetaData.java
@@ -39,10 +39,9 @@ public Object invoke(PageContext pc, Object[] args) throws PageException {
 
  // required
  String bucketName = cast.toString(args[0]);
- String objectName = cast.toString(args[1]);
- if (isEmpty(objectName)) objectName = null;
 
  // optional
+ String objectName = args.length > 1 && !isEmpty(args[1]) ? cast.toString(args[1]) : null;
  String accessKeyId = args.length > 2 && args[2] != null ? cast.toString(args[2]) : null;
  String secretAccessKey = args.length > 3 && args[3] != null ? cast.toString(args[3]) : null;
  String host = args.length > 4 && args[4] != null ? cast.toString(args[4]) : null;

diff --git a/tests/functions/ACL.cfc b/tests/functions/ACL.cfc
@@ -169,7 +169,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
 
  // check inital data
  if(useS3Function) {
- var acl=isEmpty(arguments.objectName)?S3GetACL(arguments.bucketName):S3GetACL(arguments.bucketName,arguments.objectName);
+ var acl=S3GetACL(arguments.bucketName,isEmpty(arguments.objectName)?"":arguments.objectName);
  }
  else {
  var acl=StoreGetACL(dir);
@@ -190,7 +190,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  }
 
  if(useS3Function) {
-  var acl=isEmpty(arguments.objectName)?S3GetACL(arguments.bucketName):S3GetACL(arguments.bucketName,arguments.objectName);
+  var acl=S3GetACL(arguments.bucketName,isEmpty(arguments.objectName)?"":arguments.objectName);
  }
  else {
  var acl=StoreGetACL(dir);