Bug fix attachment ordering

Olog · Aug 15, 2023 · fd5ecf8 · fd5ecf8
1 parent cd30d46
commit fd5ecf8
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/main/java/org/phoebus/olog/LogResource.java b/src/main/java/org/phoebus/olog/LogResource.java
@@ -301,14 +301,20 @@ public Log createLog(@RequestHeader(value = OLOG_CLIENT_INFO_HEADER, required =
         Log newLogEntry = createLog(clientInfo, markup, inReplyTo, logEntry, principal);
 
         if (files != null) {
-            Iterator<Attachment> attachmentIterator = logEntry.getAttachments().iterator();
             for (int i = 0; i < files.length; i++) {
-                Attachment attachment = attachmentIterator.next();
+                String originalFileName = files[i].getOriginalFilename();
+                Optional<Attachment> attachment =
+                    logEntry.getAttachments().stream()
+                            .filter(a -> a.getFilename() != null && a.getFilename().equals(originalFileName)).findFirst();
+                if(attachment.isEmpty()){ // Should not happen if client behaves correctly
+                    logger.log(Level.WARNING, "File " + originalFileName + " not matched with attachment meta-data");
+                    continue;
+                }
                 uploadAttachment(Long.toString(newLogEntry.getId()),
                         files[i],
-                        files[i].getOriginalFilename(),
-                        attachment.getId(),
-                        attachment.getFileMetadataDescription());
+                        originalFileName,
+                        attachment.get().getId(),
+                        attachment.get().getFileMetadataDescription());
             }
         }