fixing #2328 (NPE in DerivedUnitBase)

[cdmlib.git] / cdmlib-ext / src / main / java / eu / etaxonomy / cdm / ext / geo / EditGeoService.java

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
index 40cefe48b357d93ab5ea8d13d70d803810dd702b..aebd385b09ec287ea3f0ae15348b0edc8a556bae 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoService.java
@@ -174,18 +174,20 @@ public class EditGeoService implements IEditGeoService{
                        List<Point> derivedUnitPoints) {\r
 \r
                Set<SpecimenOrObservationBase> originals = derivedUnit.getOriginals();\r
-               for (SpecimenOrObservationBase original : originals) {\r
-                       if (original instanceof FieldObservation) {\r
-                               Point point =  ((FieldObservation) original).getGatheringEvent().getExactLocation();\r
-                               if(point != null){\r
-                                       //FIXME: remove next statement after DerivedUnitFacade or ABCD import is fixed\r
-                                       if(point.getLatitude() == 0.0 && point.getLongitude() == 0.0){\r
-                                               continue;\r
+               if(originals != null){\r
+                       for (SpecimenOrObservationBase original : originals) {\r
+                               if (original instanceof FieldObservation) {\r
+                                       Point point =  ((FieldObservation) original).getGatheringEvent().getExactLocation();\r
+                                       if(point != null){\r
+                                               //FIXME: remove next statement after DerivedUnitFacade or ABCD import is fixed\r
+                                               if(point.getLatitude() == 0.0 && point.getLongitude() == 0.0){\r
+                                                       continue;\r
+                                               }\r
+                                               derivedUnitPoints.add(point);\r
                                        }\r
-                                       derivedUnitPoints.add(point);\r
+                               } else {\r
+                                       registerDerivedUnitLocations((DerivedUnitBase) original, derivedUnitPoints);\r
                                }\r
-                       } else {\r
-                               registerDerivedUnitLocations((DerivedUnitBase) original, derivedUnitPoints);\r
                        }\r
                }\r
 \r