Merge pull request #380 from Kitzanos/fixed-doc-issue-mail

Cherry-pick ( Fixed document issue in mail sending API)
This commit is contained in:
Rinaldo
2026-02-20 12:29:46 +01:00
committed by GitHub

View File

@@ -50,9 +50,9 @@ public class S3DocxProcessor {
try (S3Object s3Object = s3Client.getObject(bucket, key); try (S3Object s3Object = s3Client.getObject(bucket, key);
InputStream originalStream = new BufferedInputStream(s3Object.getObjectContent())) { InputStream originalStream = new BufferedInputStream(s3Object.getObjectContent())) {
byte[] updatedBytes=null; byte[] updatedBytes=null;
if (isDocxFile(originalStream)) { if(Boolean.FALSE.equals(key.endsWith(".zip")) && (replacements!=null && Boolean.FALSE.equals(replacements.isEmpty())) && isDocxFile(originalStream)) {
log.warn("Skipping non-DOCX file from S3: bucket={}, key={}", bucket, key); log.warn("Skipping non-DOCX file from S3: bucket={}, key={}", bucket, key);
updatedBytes = replacePlaceholders(originalStream, replacements); updatedBytes = replacePlaceholders(originalStream, replacements);
}else { }else {
// non-DOCX → just copy raw stream // non-DOCX → just copy raw stream
updatedBytes = originalStream.readAllBytes(); updatedBytes = originalStream.readAllBytes();