Merge pull request #397 from keeps/alindo-dev-release

fixed NPE when fileExtension is empty and entry null
keeps · May 17, 2024 · 0ca677b · 0ca677b
2 parents 2e0daee + 051443a
commit 0ca677b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...n/java/com/databasepreservation/common/transformers/ToolkitStructure2ViewerStructure.java b/...n/java/com/databasepreservation/common/transformers/ToolkitStructure2ViewerStructure.java
@@ -9,7 +9,6 @@
 
 import com.databasepreservation.common.client.models.structure.ViewerLobStoreType;
 import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -912,7 +911,11 @@ private static void detectMimeType(ViewerRow row, ViewerCell cell, String databa
       if (StringUtils.isAllBlank(fileExtension)) {
         try {
           if (blobIsInsideSiard) {
-            inputStream = zipFile.getInputStream(entry);
+            if (entry != null) {
+              inputStream = zipFile.getInputStream(entry);
+            } else {
+              inputStream = new ByteArrayInputStream(lobCellValue.getBytes());
+            }
           } else {
             final Path lobPath = Paths.get(lobCellValue);
             final Path completeLobPath = ViewerFactory.getViewerConfiguration().getSIARDFilesPath().resolve(lobPath);