ref #8115: first steps to solve problems with moving description elements

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
index 64958bc68e06b4fe07f9e55d50083c2006db6c5e..46e3062e8042cf972fd455b7797cce9cdd1a8035 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
@@ -711,7 +711,8 @@ public class DescriptionServiceImpl
             boolean isCopy) {
 
         UpdateResult result = new UpdateResult();
-        if (descriptionElements.isEmpty() ){
+        if (descriptionElements.isEmpty() || descriptionElements.iterator().next() == null){
+            result.setAbort();
             return result;
         }
 
@@ -764,7 +765,10 @@ public class DescriptionServiceImpl
             boolean isCopy) {
         Set<DescriptionElementBase> descriptionElements = new HashSet<DescriptionElementBase>();
         for(UUID deUuid : descriptionElementUUIDs) {
-            descriptionElements.add(descriptionElementDao.load(deUuid));
+            DescriptionElementBase element = descriptionElementDao.load(deUuid);
+            if (element != null){
+                descriptionElements.add(element);
+            }
         }
         DescriptionBase targetDescription = dao.load(targetDescriptionUuid);