QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-17 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-1772: fix aws expecting content type if object metadata is given

Browse Source
This commit is contained in:
Tim Chamberlain
2024-11-03 21:53:50 -06:00
parent ce50120234
commit 6ef0a89533
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3UploadOutputStream.java
View File

@ -98,8 +98,12 @@ public class S3UploadOutputStream extends OutputStream
*******************************************************************************/
private void uploadIfNeeded()
{
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentType(this.contentType);
ObjectMetadata objectMetadata = null;
if(this.contentType != null)
{
objectMetadata = new ObjectMetadata();
objectMetadata.setContentType(this.contentType);
}
if(offset == buffer.length)
{
@ -173,8 +177,12 @@ public class S3UploadOutputStream extends OutputStream
return;
}
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentType(this.contentType);
ObjectMetadata objectMetadata = null;
if(this.contentType != null)
{
objectMetadata = new ObjectMetadata();
objectMetadata.setContentType(this.contentType);
}
if(initiateMultipartUploadResult != null)
{
@ -204,6 +212,11 @@ public class S3UploadOutputStream extends OutputStream
}
else
{
if(objectMetadata == null)
{
objectMetadata = new ObjectMetadata();
}
LOG.info("Putting object (non-multipart)", logPair("key", key), logPair("length", offset));
objectMetadata.setContentLength(offset);
PutObjectResult putObjectResult = amazonS3.putObject(bucketName, key, new ByteArrayInputStream(buffer, 0, offset), objectMetadata);