From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 7 Dec 2015 14:25:15 +0000 (+0100)
Subject: Fix possible NPE
X-Git-Tag: 3.12.0^2~31
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0fc5c09c0f1e7b39adf2185d9307410c9c4a98ba

Fix possible NPE
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java
index eb81115f5..697565e07 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java
@@ -95,14 +95,14 @@ public class TaxonAssociationDetailElement extends AbstractCdmDetailElement<Deri
                 @Override
                 public String getText(Object element) {
                     SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation)element;
-                    String label = typeDesignation.getTypeStatus().getLabel()+" of ";
-                        Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
-                        for (TaxonNameBase taxonNameBase : typifiedNames) {
-                            label += taxonNameBase+", ";
-                        }
-                        if(label.endsWith(", ")){
-                            label = label.substring(0, label.length()-2);
-                        }
+                    String label = typeDesignation.getTypeStatus()!=null?typeDesignation.getTypeStatus().getLabel()+" of ":"Type of ";
+                    Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
+                    for (TaxonNameBase taxonNameBase : typifiedNames) {
+                        label += taxonNameBase+", ";
+                    }
+                    if(label.endsWith(", ")){
+                        label = label.substring(0, label.length()-2);
+                    }
                     return label;
                 }
             });