Ensure original filename is provided for log attachments. Closes #1684

Author: iTerminate

src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/model/jsf/beans/LogAttachmentUploadBean.java

@@ -50,7 +50,8 @@ public void upload(UploadedFile uploadedFile) {
         Path uploadDirPath;
         try {
             if (uploadedFile != null && !uploadedFile.getFileName().isEmpty()) {
-                String uploadedExtension = FileUtility.getFileExtension(uploadedFile.getFileName());
+                String fileName = uploadedFile.getFileName();
+                String uploadedExtension = FileUtility.getFileExtension(fileName);
 
                 uploadDirPath = Paths.get(StorageUtility.getFileSystemLogAttachmentsDirectory());
                 logger.debug("Using log attachments directory: " + uploadDirPath.toString());
@@ -66,13 +67,14 @@ public void upload(UploadedFile uploadedFile) {
                 logger.debug("Saved file: " + originalFile.toPath());
                 Attachment attachment = new Attachment();
                 attachment.setName(originalFile.getName());
+                attachment.setOriginalFilename(fileName);
                 List<Attachment> attachmentList = logEntry.getAttachmentList();
                 if (attachmentList == null) {
                     attachmentList = new ArrayList<>();
                     logEntry.setAttachmentList(attachmentList);
                 }
                 attachmentList.add(attachment);
-                SessionUtility.addInfoMessage("Success", "Uploaded file " + uploadedFile.getFileName() + ".");
+                SessionUtility.addInfoMessage("Success", "Uploaded file " + fileName + ".");
             }
         } catch (IOException ex) {
             logger.error(ex);