fixed remaining nullpointer for licenses without image url

IQSS · Mar 17, 2022 · 993f85e · 993f85e
1 parent 2718c57
commit 993f85e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -561,7 +561,7 @@ public static String getLicenseURI(DatasetVersion dsv) {
 
     public static String getLicenseIcon(DatasetVersion dsv) {
         License license = dsv.getTermsOfUseAndAccess().getLicense();
-        return license != null ? license.getIconUrl().toString() : null;
+        return license != null && license.getIconUrl() != null ? license.getIconUrl().toString() : null;
     }
 
     public static String getLicenseDescription(DatasetVersion dsv) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -798,7 +798,7 @@ public static JsonObjectBuilder json(License license) {
             .add("name", license.getName())
             .add("shortDescription", license.getShortDescription())
             .add("uri", license.getUri().toString())
-            .add("iconUrl", license.getIconUrl().toString())
+            .add("iconUrl", license.getIconUrl() == null ? null : license.getIconUrl().toString())
             .add("active", license.isActive())
             .add("isDefault", license.isDefault());
     }