Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / occurrence / DerivedUnit.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java
index d3a71d2897070909abc1a9d2cbdf2a8343f7e7d0..6adcfe8eed558888ffb7540e4f7e018ef06603ca 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java
@@ -87,7 +87,7 @@ public class DerivedUnit extends SpecimenOrObservationBase<IIdentifiableEntityCa
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
        @ManyToOne(fetch = FetchType.LAZY)
-       @Cascade(CascadeType.SAVE_UPDATE)
+       @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
        @IndexedEmbedded
        private Collection collection;
 
@@ -123,7 +123,7 @@ public class DerivedUnit extends SpecimenOrObservationBase<IIdentifiableEntityCa
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
        @ManyToOne(fetch = FetchType.LAZY)
-       @Cascade(CascadeType.SAVE_UPDATE)
+       @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
        @IndexedEmbedded
        private TaxonNameBase storedUnder;
 
@@ -131,7 +131,7 @@ public class DerivedUnit extends SpecimenOrObservationBase<IIdentifiableEntityCa
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
        @ManyToOne(fetch = FetchType.LAZY)
-       @Cascade(CascadeType.SAVE_UPDATE)
+       @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
        @IndexedEmbedded(depth = 4)
        private DerivationEvent derivedFrom;
 
@@ -152,7 +152,7 @@ public class DerivedUnit extends SpecimenOrObservationBase<IIdentifiableEntityCa
        @XmlIDREF
        @XmlSchemaType(name = "IDREF")
        @ManyToOne(fetch = FetchType.LAZY)
-    @Cascade(CascadeType.SAVE_UPDATE)
+    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
        private PreservationMethod preservation;