improve exception handling

lucee · Sep 4, 2023 · 2e623f2 · 2e623f2
1 parent 504d159
commit 2e623f2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/source/java/src/org/lucee/extension/resource/s3/S3.java b/source/java/src/org/lucee/extension/resource/s3/S3.java
@@ -1252,6 +1252,7 @@ public void copyObject(String srcBucketName, String srcObjectName, String trgBuc
 		srcObjectName = improveObjectName(srcObjectName, false);
 		trgBucketName = improveBucketName(trgBucketName);
 		trgObjectName = improveObjectName(trgObjectName, false);
+
 		flushExists(srcBucketName, srcObjectName);
 		flushExists(trgBucketName, trgObjectName);
 		AmazonS3Client client = getAmazonS3(srcBucketName, null);
@@ -1292,7 +1293,6 @@ else if (se.getErrorCode().equals("NoSuchBucket") && !client.doesBucketExistV2(t
 							clientTarget.createBucket(cbr);
 						}
 						catch (AmazonS3Exception e) {
-							// releaseEL(clientTarget);
 							if (customACL) throw e;
 							cbr = new CreateBucketRequest(trgBucketName);
 							clientTarget.createBucket(cbr);
@@ -1305,11 +1305,14 @@ else if (se.getErrorCode().equals("NoSuchBucket") && !client.doesBucketExistV2(t
 						clientSource.release();
 					}
 				}
-				else throw toS3Exception(se);
+				else {
+					throw new S3Exception(se.getErrorCode() + ";could not copy [" + srcBucketName + "/" + srcObjectName + "] to [" + trgBucketName + "/" + trgObjectName + "]  ",
+							se);
+				}
 			}
 		}
 		catch (AmazonServiceException se) {
-			throw toS3Exception(se);
+			throw new S3Exception(se.getErrorCode() + ";could not copy [" + srcBucketName + "/" + srcObjectName + "] to [" + trgBucketName + "/" + trgObjectName + "]  ", se);
 		}
 		finally {
 			client.release();