git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
usermgt
/
jpa
/
JpaGroupSet.java
diff --git
a/security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaGroupSet.java
b/security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaGroupSet.java
index 1a9be6f217d8008ad20b4b339c716f4bff952545..6d6cde0f684c3c2e155d3c8838b884fdfd6cacf8 100644
(file)
--- a/
security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaGroupSet.java
+++ b/
security/impl/src/main/java/org/wamblee/usermgt/jpa/JpaGroupSet.java
@@
-7,6
+7,7
@@
import java.util.TreeSet;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
+import org.wamblee.persistence.JpaMergeSupport;
import org.wamblee.usermgt.Group;
import org.wamblee.usermgt.GroupSet;
import org.wamblee.usermgt.Group;
import org.wamblee.usermgt.GroupSet;
@@
-52,7
+53,8
@@
public class JpaGroupSet implements GroupSet {
@Override
public void groupModified(Group aGroup) {
assert aGroup.getPrimaryKey() != null;
@Override
public void groupModified(Group aGroup) {
assert aGroup.getPrimaryKey() != null;
- em.merge(aGroup);
+ Group merged = em.merge(aGroup);
+ JpaMergeSupport.merge(merged, aGroup);
}
@Override
}
@Override