fixed null pointer on optional values for citation (and used function…

…al programming)
IQSS · Jun 20, 2016 · 5603b07 · 5603b07
1 parent 5f63077
commit 5603b07
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataCitation.java b/src/main/java/edu/harvard/iq/dataverse/DataCitation.java
@@ -100,9 +100,12 @@ public DataCitation(DatasetVersion dsv) {
         UNF = dsv.getUNF();
 
         // optional values
-        for (DatasetFieldType dsfType : dsv.getDataset().getOwner().getCitationDatasetFieldTypes()) {
-            optionalValues.add(dsv.getDatasetField(dsfType));
-        }
+        dsv.getDataset().getOwner().getCitationDatasetFieldTypes().stream()
+                .map(dsfType -> dsv.getDatasetField(dsfType))
+                .filter(dsf -> dsf != null)
+                .forEach(dsf -> {
+                    optionalValues.add(dsf);
+                });
 
     }
 
@@ -166,7 +169,7 @@ public String toString(boolean html) {
             } else {
                 displayValue = formatString(dsf.getDisplayValue(), html);
             }
-            
+
             citation.append(" [").append(dsf.getDatasetFieldType().getDisplayName()).append(":")
                     .append(displayValue)
                     .append("]");