From a00dd83a0c9a3272ff3004c40bfcf03691664296 Mon Sep 17 00:00:00 2001
From: Nona Luypaert <nona.luypaert@atmire.com>
Date: Thu, 8 Jun 2023 20:47:27 +0200
Subject: [PATCH] 102124: Avoid null pointer when checking disposition

---
 .../java/org/dspace/app/rest/BitstreamRestController.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
index a81d62b601..b4de375fe8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
@@ -208,6 +208,10 @@ public class BitstreamRestController {
     }
 
     private boolean checkFormatForContentDisposition(BitstreamFormat format) {
+        // never automatically download undefined formats
+        if (format == null) {
+            return false;
+        }
         List<String> formats = List.of((configurationService.getArrayProperty("webui.content_disposition_format")));
         boolean download = formats.contains(format.getMIMEType());
         if (!download) {