From: Katja Luther <k.luther@bgbm.org>
Date: Mon, 29 Jun 2020 07:34:21 +0000 (+0200)
Subject: fix NPE in reference bulk editor
X-Git-Tag: 5.16.0^2~16
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/8c2c68ce18d0b7c4fd420ac91f214ed800b50ddf

fix NPE in reference bulk editor
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
index 1ea5c4d72..f2b0a91c0 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
@@ -79,14 +79,20 @@ public class ReferenceEditorInput extends AbstractBulkEditorInput<Reference> {
         }
         else if(property.equals(PROPERTY_PUBLICATION_YEAR)){
             if (cdmBase.getDatePublished() != null){
-                String result = cdmBase.getDatePublished().getYear();
-                if (!cdmBase.getDatePublished().getYear().equals(cdmBase.getDatePublishedString()) && cdmBase.getDatePublishedString() != null) {
+                String result = "";
+                if (cdmBase.getDatePublished().getYear() != null){
+                    result = cdmBase.getDatePublished().getYear();
+                }
+                if (cdmBase.getDatePublishedString() != null && !result.equals(cdmBase.getDatePublishedString()) ) {
                     result += " (" + cdmBase.getDatePublishedString()+")";
                 }
                 return result ;
             }else if(cdmBase.getDatePublished() == null && cdmBase.getInReference() != null ){
-                String result = cdmBase.getInReference().getDatePublished().getYear();
-                if (!cdmBase.getInReference().getDatePublished().getYear().equals(cdmBase.getInReference().getDatePublishedString()) ) {
+                String result = "";
+                if (cdmBase.getInReference().getDatePublished() != null && cdmBase.getInReference().getDatePublished().getYear() != null){
+                    result = cdmBase.getInReference().getDatePublished().getYear();
+                }
+                if (cdmBase.getInReference().getDatePublishedString() != null && !result.equals(cdmBase.getInReference().getDatePublishedString()) ) {
                     result += " (" + cdmBase.getInReference().getDatePublishedString()+")";
                 }
                 return result ;