minor

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MediaServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MediaServiceImpl.java
index d46cda6db7dd69259fc64449e1a2ff83269d34aa..abe044c7440171e9162cd4011da7985b54c3fdcf 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MediaServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MediaServiceImpl.java
@@ -188,7 +188,7 @@ public class MediaServiceImpl extends IdentifiableServiceBase<Media,IMediaDao> i
                 }\r
 \r
                 if (updatedObject != null){\r
-                    service.update(updatedObject); //service should always be != null if updatedObject != null\r
+                    //service.update(updatedObject); //service should always be != null if updatedObject != null\r
                     result.addUpdatedObject((CdmBase)updatedObject);\r
                 }\r
             }\r
@@ -238,7 +238,7 @@ public class MediaServiceImpl extends IdentifiableServiceBase<Media,IMediaDao> i
 \r
                 if (description instanceof TaxonDescription){\r
                     TaxonDescription desc = HibernateProxyHelper.deproxy(description, TaxonDescription.class);\r
-                    if (desc.getTaxon() == null || (mediaConfig.isDeleteFromDescription() && (deleteFrom instanceof Taxon && ((Taxon)deleteFrom).getId() == desc.getTaxon().getId()))){\r
+                    if (mediaConfig.isDeleteFromEveryWhere() ||(desc.getTaxon() == null || (mediaConfig.isDeleteFromDescription() && (deleteFrom instanceof Taxon && ((Taxon)deleteFrom).getId() == desc.getTaxon().getId())))){\r
                         continue;\r
                     } else{\r
                         message = "The media can't be deleted from the database because it is referenced by a taxon. ("+desc.getTaxon().getTitleCache()+")";\r
@@ -247,7 +247,7 @@ public class MediaServiceImpl extends IdentifiableServiceBase<Media,IMediaDao> i
 \r
                 } else if (description instanceof SpecimenDescription){\r
                     SpecimenDescription desc = HibernateProxyHelper.deproxy(description, SpecimenDescription.class);\r
-                    if (desc.getDescribedSpecimenOrObservation() == null || (mediaConfig.isDeleteFromDescription() && (deleteFrom instanceof SpecimenOrObservationBase && ((SpecimenOrObservationBase)deleteFrom).getId() == desc.getDescribedSpecimenOrObservation().getId()))){\r
+                    if (mediaConfig.isDeleteFromEveryWhere() || (desc.getDescribedSpecimenOrObservation() == null || (mediaConfig.isDeleteFromDescription() && (deleteFrom instanceof SpecimenOrObservationBase && ((SpecimenOrObservationBase)deleteFrom).getId() == desc.getDescribedSpecimenOrObservation().getId())))){\r
                         continue;\r
                     } else{\r
                         message = "The media can't be deleted from the database because it is referenced by a specimen or observation. ("+desc.getDescribedSpecimenOrObservation().getTitleCache()+")";\r
@@ -255,7 +255,7 @@ public class MediaServiceImpl extends IdentifiableServiceBase<Media,IMediaDao> i
                     }\r
                 } else if (description instanceof TaxonNameDescription){\r
                     TaxonNameDescription desc = HibernateProxyHelper.deproxy(description, TaxonNameDescription.class);\r
-                    if (desc.getTaxonName() == null || (mediaConfig.isDeleteFromDescription() && (deleteFrom instanceof TaxonName && ((TaxonName)deleteFrom).getId() == desc.getTaxonName().getId()))){\r
+                    if (mediaConfig.isDeleteFromEveryWhere() || (desc.getTaxonName() == null || (mediaConfig.isDeleteFromDescription() && (deleteFrom instanceof TaxonName && ((TaxonName)deleteFrom).getId() == desc.getTaxonName().getId())))){\r
                         continue;\r
                     } else{\r
                         message = "The media can't be deleted from the database because it is referenced by a scientific name. ("+desc.getTaxonName().getTitleCache()+")";\r