Skip to content

Commit a520799

Browse files
committed
another NPE possibility
1 parent 79b8d89 commit a520799

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,11 @@ public void registerExternalVocabValues(DatasetField df) {
355355
siblingsDatasetFields = df.getParentDatasetFieldCompoundValue().getChildDatasetFields();
356356
}
357357
for (DatasetFieldValue dfv : df.getDatasetFieldValues()) {
358-
registerExternalTerm(cvocEntry, dfv.getValue(), siblingsDatasetFields);
358+
if (dfv.getValue() == null) {
359+
logger.warning("Found null value for field: " + dft.getName());
360+
} else {
361+
registerExternalTerm(cvocEntry, dfv.getValue(), siblingsDatasetFields);
362+
}
359363
}
360364
} else {
361365
if (df.getDatasetFieldType().isCompound()) {
@@ -461,7 +465,7 @@ public void registerExternalTerm(JsonObject cvocEntry, String term, List<Dataset
461465
String retrievalUri = cvocEntry.getString("retrieval-uri");
462466
String termUriFieldName = cvocEntry.getString("term-uri-field");
463467
String prefix = cvocEntry.getString("prefix", null);
464-
if(term.isBlank()) {
468+
if(StringUtils.isBlank(term)) {
465469
logger.fine("Ignoring blank term");
466470
return;
467471
}

0 commit comments

Comments
 (0)