ZEPHYR-28941: url decoded attachment response file name before matching

jenkinsci · May 14, 2020 · e54b0af · e54b0af
1 parent 771b5ac
commit e54b0af
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/com/thed/service/impl/AttachmentServiceImpl.java b/src/main/java/com/thed/service/impl/AttachmentServiceImpl.java
@@ -7,6 +7,7 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -93,7 +94,8 @@ private void addAttachments(List<GenericAttachmentDTO> genericAttachmentDTOList)
             Attachment attachment = new Attachment();
             attachment.setContentType(genericAttachmentDTO.getContentType());
 
-            GenericAttachmentDTO oldAttachment = genericAttachmentDTOList.stream().filter(attachmentDTO -> genericAttachmentDTO.getFileName().equals(attachmentDTO.getFileName())).findAny().orElse(null);
+            String createdFileName = URLDecoder.decode(genericAttachmentDTO.getFileName(), "UTF-8");
+            GenericAttachmentDTO oldAttachment = genericAttachmentDTOList.stream().filter(attachmentDTO -> createdFileName.equals(attachmentDTO.getFileName())).findAny().orElse(null);
 
             if(oldAttachment != null) {
                 attachment.setFileSize((long)oldAttachment.getByteData().length);