From 9f128343e5face61304fc72aafda17dd77ee39bc Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Wed, 17 Apr 2024 16:22:28 +0200
Subject: [PATCH] BIS-1034: Fixed NullPointerException in DataSetUploadClient
---
.../cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
index e928dc312c5..22a53c2ad2b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
@@ -319,7 +319,7 @@ public class DataSetPropertiesPanel extends JPanel
} else if (formField instanceof VocabularyTermsComboBoxPanel)
{
VocabularyTermsComboBoxPanel comboBox = (VocabularyTermsComboBoxPanel) formField;
- if(propertyValue.getClass().isArray()){
+ if(propertyValue != null && propertyValue.getClass().isArray()){
Serializable[] values = (Serializable[]) propertyValue;
for(Serializable val : values) {
setVocabToComboBox(comboBox, (String) val);
--
GitLab