proper S3 object handling (#97)

agorapulse · May 30, 2019 · f8b8533 · f8b8533
1 parent 76fae63
commit f8b8533
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.2.15
+version=2.2.16
 awsJavaSdkVersion=1.11.500
 awsKinesisClientVersion=1.8.5
 gradleWrapperVersion=3.4.1

diff --git a/grails-aws-sdk-s3/grails-app/services/grails/plugin/awssdk/s3/AmazonS3Service.groovy b/grails-aws-sdk-s3/grails-app/services/grails/plugin/awssdk/s3/AmazonS3Service.groovy
@@ -470,10 +470,11 @@ class AmazonS3Service implements InitializingBean {
             String destinationBucketName,
             String destinationKey
     ) {
+        S3Object object
         try {
             CopyObjectRequest request = new CopyObjectRequest(sourceBucketName, sourceKey, destinationBucketName, destinationKey)
 
-            S3Object object = client.getObject(sourceBucketName, sourceKey)
+            object = client.getObject(sourceBucketName, sourceKey)
 
             if (object.taggingCount) {
                 GetObjectTaggingRequest taggingRequest = new GetObjectTaggingRequest(sourceBucketName, sourceKey)
@@ -494,6 +495,8 @@ class AmazonS3Service implements InitializingBean {
         } catch (AmazonClientException e) {
             log.error("Exception moving object $sourceBucketName/$sourceKey to $destinationBucketName/$destinationKey", e)
             return null
+        } finally {
+            object?.close()
         }
     }