From 27e4258c74c8c2c208733a38c66ecd9a21297be3 Mon Sep 17 00:00:00 2001
From: ralf <ralf@fujitsu>
Date: Sat, 23 Nov 2019 13:57:11 +0100
Subject: [PATCH] Add null check in reading mimetype from database

---
 .../commons/jdbi/MimeTypeColumnMapperFactory.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dc-commons-jdbi/src/main/java/de/digitalcollections/commons/jdbi/MimeTypeColumnMapperFactory.java b/dc-commons-jdbi/src/main/java/de/digitalcollections/commons/jdbi/MimeTypeColumnMapperFactory.java
index 46a1af32..2dd67e9e 100644
--- a/dc-commons-jdbi/src/main/java/de/digitalcollections/commons/jdbi/MimeTypeColumnMapperFactory.java
+++ b/dc-commons-jdbi/src/main/java/de/digitalcollections/commons/jdbi/MimeTypeColumnMapperFactory.java
@@ -13,7 +13,11 @@ public class MimeTypeColumnMapperFactory implements ColumnMapperFactory {
   public Optional<ColumnMapper<?>> build(Type type, ConfigRegistry config) {
     if (type == MimeType.class) {
       return Optional.of((resultSet, columnNumber, statementContext) -> {
-        return MimeType.fromTypename(resultSet.getString(columnNumber));
+        final String typename = resultSet.getString(columnNumber);
+        if (typename == null) {
+          return null;
+        }
+        return MimeType.fromTypename(typename);
       });
     }
     return Optional.empty();