From 64ffb29b7b4c443cf8a34548c38666a8bb8b6431 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 25 Jul 2017 14:54:57 +0000
Subject: [PATCH] CCM NG/ccm-core: MimeTypeConverter now works with null values
 for the MimeType in the database

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4884 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 577413c864c2af53d1b58f15c8d2dd74f9385db6
---
 .../main/java/org/libreccm/jpa/utils/MimeTypeConverter.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java b/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java
index 342854c4a..693a60eaf 100644
--- a/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java
+++ b/ccm-core/src/main/java/org/libreccm/jpa/utils/MimeTypeConverter.java
@@ -43,6 +43,9 @@ public class MimeTypeConverter implements AttributeConverter<MimeType, String> {
 
     @Override
     public MimeType convertToEntityAttribute(final String dbData) {
+        if (dbData == null) {
+            return null;
+        }
         try {
             return new MimeType(dbData);
         } catch (MimeTypeParseException ex) {