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/name/NonViralName.java
181 181
    @XmlSchemaType(name = "IDREF")
182 182
    @ManyToOne(fetch = FetchType.LAZY)
183 183
//    @Target(TeamOrPersonBase.class)
184
    @Cascade(CascadeType.SAVE_UPDATE)
184
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
185 185
    @CacheUpdate("authorshipCache")
186 186
    @IndexedEmbedded
187 187
    private TeamOrPersonBase<?> combinationAuthorTeam;
......
191 191
    @XmlSchemaType(name = "IDREF")
192 192
    @ManyToOne(fetch = FetchType.LAZY)
193 193
//    @Target(TeamOrPersonBase.class)
194
    @Cascade(CascadeType.SAVE_UPDATE)
194
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
195 195
    @CacheUpdate("authorshipCache")
196 196
    @IndexedEmbedded
197 197
    private TeamOrPersonBase<?> exCombinationAuthorTeam;
......
201 201
    @XmlSchemaType(name = "IDREF")
202 202
    @ManyToOne(fetch = FetchType.LAZY)
203 203
//    @Target(TeamOrPersonBase.class)
204
    @Cascade(CascadeType.SAVE_UPDATE)
204
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
205 205
    @CacheUpdate("authorshipCache")
206 206
    @IndexedEmbedded
207 207
    private TeamOrPersonBase<?> basionymAuthorTeam;
......
211 211
    @XmlSchemaType(name = "IDREF")
212 212
    @ManyToOne(fetch = FetchType.LAZY)
213 213
//    @Target(TeamOrPersonBase.class)
214
    @Cascade(CascadeType.SAVE_UPDATE)
214
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
215 215
    @CacheUpdate("authorshipCache")
216 216
    @IndexedEmbedded
217 217
    private TeamOrPersonBase<?> exBasionymAuthorTeam;

Also available in: Unified diff