Skip to content

Commit 7a3964b

Browse files
authored
Merge pull request #11407 from DANS-KNAW-jp/optimistic-lock
Prevent needless optimistic lock exception for role assignment removal
2 parents 9e57e73 + 1ff0caa commit 7a3964b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ public class RoleAssignment implements java.io.Serializable {
9494
@ManyToOne( cascade = {CascadeType.MERGE} )
9595
@JoinColumn( nullable=false )
9696
private DataverseRole role;
97-
98-
@ManyToOne( cascade = {CascadeType.MERGE} )
97+
98+
@ManyToOne
9999
@JoinColumn( nullable=false )
100100
private DvObject definitionPoint;
101101

0 commit comments

Comments
 (0)