From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 5 Oct 2015 11:23:24 +0000 (+0200)
Subject: Add null check to derivate label provider (#5271)
X-Git-Tag: 3.12.0^2~126^2~4
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/29e3f630514c93c8bd73d92b2af219e3d7bf16d0?ds=sidebyside

Add null check to derivate label provider (#5271)
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index 98bf707de..7b9a8d063 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@ -218,7 +218,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 //java.util.Collection<FieldUnit> fieldUnits = CdmStore.getService(IOccurrenceService.class).getFieldUnits(derivedUnit.getUuid());
                 //TODO : This is not generic anymore for performance reasons
                 Set<SpecimenOrObservationBase> originals = derivedUnit.getOriginals();
-                if(originals.size() ==1) {
+                if(originals!=null && originals.size() ==1) {
                     SpecimenOrObservationBase specimen = originals.iterator().next();
                     if(specimen instanceof FieldUnit) {
                         FieldUnit fieldUnit = (FieldUnit)specimen;