fix getPreservedSpecimen in fieldUnitDTO

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / dto / PreservedSpecimenDTO.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/PreservedSpecimenDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/PreservedSpecimenDTO.java
index a788de4e1980b4103b86f6f70cccccaf69ff4d8a..200b7a8eaa82f23baaf45e689fec0d5b26ba8fc7 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/PreservedSpecimenDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/PreservedSpecimenDTO.java
@@ -18,7 +18,6 @@ import java.util.UUID;
 import org.hibernate.envers.tools.Pair;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
@@ -77,15 +76,16 @@ public class PreservedSpecimenDTO extends DerivateDTO{
         super(derivedUnit);
     }
 
-    public static PreservedSpecimenDTO newInstance(DerivedUnit derivedUnit, TaxonName name ){
+    public static PreservedSpecimenDTO newInstance(DerivedUnit derivedUnit){
         PreservedSpecimenDTO newInstance = new PreservedSpecimenDTO(derivedUnit);
 
 //        newInstance.setTitleCache(derivedUnit.getTitleCache());
 
         newInstance.accessionNumber = derivedUnit.getAccessionNumber();
         newInstance.preferredStableUri = derivedUnit.getPreferredStableUri();
-
-        newInstance.setCollectioDTo(new CollectionDTO(HibernateProxyHelper.deproxy(derivedUnit.getCollection())));
+        if (derivedUnit.getCollection() != null){
+            newInstance.setCollectioDTo(new CollectionDTO(HibernateProxyHelper.deproxy(derivedUnit.getCollection())));
+        }
         newInstance.setBarcode(derivedUnit.getBarcode());
         newInstance.setCatalogNumber(derivedUnit.getCatalogNumber());
         newInstance.listLabel = derivedUnit.getCatalogNumber();