From 535c250baec7808a722b8cdddd27f68e88852f61 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 23 Feb 2021 17:33:55 +0200
Subject: [PATCH] Fix critical issue when creating comboboxes with the multiple
 selection untouched

(cherry picked from commit e88f88d97cd3f4c674587655ad880ddd48065b73)
---
 .../models/data/components/commons/datafield/WordListData.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/WordListData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/WordListData.java
index 51cd7f840..d8fdebca4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/WordListData.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/WordListData.java
@@ -79,7 +79,7 @@ public class WordListData extends ComboBoxData<WordListData> {
                 }
             }
             Object multiList1 = ((Map<String, Object>) data).get("multiList");
-            this.multiList = multiList1 instanceof String ? Boolean.parseBoolean((String) multiList1) : (Boolean) multiList1;
+            this.multiList = multiList1 != null && (multiList1 instanceof String ? Boolean.parseBoolean((String) multiList1) : (Boolean) multiList1);
         }
         return this;
     }