ref #6668 Include deleted derivatives recursively into DeleteResult

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
index 81c9dfe40cae79966b76989f43777e92a7301bb7..e2f1411fc00f2ccea3d6a2f049c854d953b82cc0 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
@@ -1225,7 +1225,7 @@ public class OccurrenceServiceImpl extends IdentifiableServiceBase<SpecimenOrObs
                     derivativesToDelete.add(unit);
                 }
                 for (DerivedUnit unit:derivativesToDelete){
-                    delete(unit, config);
+                    deleteResult.includeResult(delete(unit, config));
                 }
             }
         }

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UpdateResult.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UpdateResult.java
index 57b5bf23c779c3cd93fc1637e71c518868520ed5..3dc31d0c5813e6edb8f1dff1d78a24e19633d4f0 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UpdateResult.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UpdateResult.java
@@ -184,6 +184,8 @@ public class UpdateResult implements Serializable{
         this.setMaxStatus(includedResult.getStatus());\r
         this.addExceptions(includedResult.getExceptions());\r
         this.addUpdatedObjects(includedResult.getUpdatedObjects());\r
+        //also add cdm entity of included result to updatet objects\r
+        this.getUpdatedObjects().add(includedResult.getCdmEntity());\r
     }\r
 \r
     public boolean isOk(){\r