Merge pull request #3068 from ControlSystemStudio/CSSTUDIO-2460

CSSTUDIO-2460 Bugfix for the Logbook application: Delete temporary file when file attachment object is garbage collected.
ControlSystemStudio · Jul 8, 2024 · 187d6b6 · 187d6b6
2 parents 35a1d20 + a0423e6
commit 187d6b6
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...ok/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/SingleLogEntryDisplayController.java b/...ok/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/SingleLogEntryDisplayController.java
@@ -188,7 +188,14 @@ private void fetchAttachments() {
             Collection<Attachment> attachments = logEntry.getAttachments().stream()
                     .filter((attachment) -> attachment.getName() != null && !attachment.getName().isEmpty())
                     .map((attachment) -> {
-                        OlogAttachment fileAttachment = new OlogAttachment();
+                        OlogAttachment fileAttachment = new OlogAttachment() {
+                            @Override
+                            protected void finalize() {
+                                if (getFile() != null && getFile().exists()) {
+                                    getFile().delete();
+                                }
+                            }
+                        };
                         fileAttachment.setContentType(attachment.getContentType());
                         fileAttachment.setThumbnail(false);
                         fileAttachment.setFileName(attachment.getName());