Add null check to derivate label provider (#5271)
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 5 Oct 2015 11:23:24 +0000 (13:23 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 5 Oct 2015 11:23:24 +0000 (13:23 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java

index 98bf707de264f74204bc3354cc7d25c6e33f030c..7b9a8d0630138f0f4bd428a3a5a07504709c9611 100644 (file)
@@ -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();
                 //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;
                     SpecimenOrObservationBase specimen = originals.iterator().next();
                     if(specimen instanceof FieldUnit) {
                         FieldUnit fieldUnit = (FieldUnit)specimen;