Project

General

Profile

« Previous | Next » 

Revision 903cecc9

Added by Cherian Mathew over 9 years ago

added Cascade.MERGE to all fields with annotation Cascade.SAVE_UPDATE

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationBase.java
116 116
    @XmlElementWrapper(name = "Descriptions")
117 117
    @XmlElement(name = "Description")
118 118
    @OneToMany(mappedBy="describedSpecimenOrObservation", fetch = FetchType.LAZY)
119
    @Cascade(CascadeType.SAVE_UPDATE)
119
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
120 120
    @ContainedIn
121 121
    @NotNull
122 122
    private Set<DescriptionBase> descriptions = new HashSet<DescriptionBase>();
......
168 168
    @XmlJavaTypeAdapter(MultilanguageTextAdapter.class)
169 169
    @OneToMany(fetch = FetchType.LAZY, orphanRemoval=true)
170 170
    @MapKeyJoinColumn(name="definition_mapkey_id")
171
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.DELETE})
171
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE, CascadeType.DELETE})
172 172
    @IndexedEmbedded
173 173
    @NotNull
174 174
    protected Map<Language,LanguageString> definition = new HashMap<Language,LanguageString>();
......
179 179
    @XmlIDREF
180 180
    @XmlSchemaType(name = "IDREF")
181 181
    @ManyToMany(fetch=FetchType.LAZY)
182
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.DELETE})
182
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE, CascadeType.DELETE})
183 183
    @NotNull
184 184
    protected Set<DerivationEvent> derivationEvents = new HashSet<DerivationEvent>();
185 185

  

Also available in: Unified diff