From 8699d55194b0ce56a08b1643808a1af5ef3cdbf3 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Thu, 4 Jun 2026 14:22:33 +0200
Subject: [PATCH 1/2] retention null pointer exception

---
 src/main/webapp/file.xhtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 885a116ec58..a93a00d096c 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -566,7 +566,8 @@
                                                         <th scope="row">
                                                             #{bundle['file.metadataTab.fileMetadata.publicationDate.label']}
                                                         </th>
-                                                        <td>#{(empty FilePage.file.embargo) and !(empty FilePage.file.released) and !(empty FilePage.file.retention) ? ''.concat(FilePage.file.publicationDateFormattedYYYYMMDD).concat('; ') : ''}
+                                                        <td>#{(empty FilePage.file.embargo) and FilePage.file.released and !(empty FilePage.file.retention) ? FilePage.file.publicationDateFormattedYYYYMMDD : ''}
+                                                            #{(empty FilePage.file.embargo) and FilePage.file.released and !(empty FilePage.file.retention) ? '; ' : ''}
                                                             #{!(empty FilePage.file.embargo) ? ''.concat(FilePage.embargoPhrase).concat(' ').concat(FilePage.file.embargo.dateAvailable) : ''}
                                                             #{!(empty FilePage.file.embargo) and !(empty FilePage.file.retention) ? '; ': ''}
                                                             #{!(empty FilePage.file.retention) ? ''.concat(FilePage.retentionPhrase)

From 40a8300bfa4c20544679af443462da5193c8a739 Mon Sep 17 00:00:00 2001
From: jo-pol <jo-pol@users.noreply.github.com>
Date: Mon, 8 Jun 2026 10:33:14 +0200
Subject: [PATCH 2/2] review

---
 src/main/webapp/file.xhtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index a93a00d096c..2ee9892abbb 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -566,8 +566,7 @@
                                                         <th scope="row">
                                                             #{bundle['file.metadataTab.fileMetadata.publicationDate.label']}
                                                         </th>
-                                                        <td>#{(empty FilePage.file.embargo) and FilePage.file.released and !(empty FilePage.file.retention) ? FilePage.file.publicationDateFormattedYYYYMMDD : ''}
-                                                            #{(empty FilePage.file.embargo) and FilePage.file.released and !(empty FilePage.file.retention) ? '; ' : ''}
+                                                        <td>#{(empty FilePage.file.embargo) and FilePage.file.released and !(empty FilePage.file.retention) ? ''.concat(FilePage.file.publicationDateFormattedYYYYMMDD).concat('; ') : ''}
                                                             #{!(empty FilePage.file.embargo) ? ''.concat(FilePage.embargoPhrase).concat(' ').concat(FilePage.file.embargo.dateAvailable) : ''}
                                                             #{!(empty FilePage.file.embargo) and !(empty FilePage.file.retention) ? '; ': ''}
                                                             #{!(empty FilePage.file.retention) ? ''.concat(FilePage.retentionPhrase)