another NPE possibility

IQSS · Jun 5, 2024 · a520799 · a520799
1 parent 79b8d89
commit a520799
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java
@@ -355,7 +355,11 @@ public void registerExternalVocabValues(DatasetField df) {
                 siblingsDatasetFields = df.getParentDatasetFieldCompoundValue().getChildDatasetFields();
             }
             for (DatasetFieldValue dfv : df.getDatasetFieldValues()) {
-                registerExternalTerm(cvocEntry, dfv.getValue(), siblingsDatasetFields);
+                if (dfv.getValue() == null) {
+                    logger.warning("Found null value for field: " + dft.getName());
+                } else {
+                    registerExternalTerm(cvocEntry, dfv.getValue(), siblingsDatasetFields);
+                }
             }
         } else {
             if (df.getDatasetFieldType().isCompound()) {
@@ -461,7 +465,7 @@ public void registerExternalTerm(JsonObject cvocEntry, String term, List<Dataset
         String retrievalUri = cvocEntry.getString("retrieval-uri");
         String termUriFieldName = cvocEntry.getString("term-uri-field");
         String prefix = cvocEntry.getString("prefix", null);
-        if(term.isBlank()) {
+        if(StringUtils.isBlank(term)) {
             logger.fine("Ignoring blank term");
             return;
         }