From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 1 Dec 2015 14:38:32 +0000 (+0100)
Subject: Fix possible NPE
X-Git-Tag: 3.12.0^2~40
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b310b0b027dd0cb94f8867cf531e07bb78c340af

Fix possible NPE
---

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 630eef093..0d587c2c2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -491,13 +491,15 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
                     }
                 }
             }
-            Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
-            Collection<UUID> uuids = new HashSet<UUID>();
-            for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
-                uuids.add(specimenOrObservationBase.getUuid());
+            if(selectedTaxon!=null){
+                Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
+                Collection<UUID> uuids = new HashSet<UUID>();
+                for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
+                    uuids.add(specimenOrObservationBase.getUuid());
+                }
+                updateRootEntities(uuids);
+                setPartName("Derivative Editor: " + selectedTaxon.getName());
             }
-            updateRootEntities(uuids);
-            setPartName("Derivative Editor: " + selectedTaxon.getName());
         }
     }