github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed to using merge() in JPA instead of persist()

pull/866/merge
Justin Richer 2015-07-09 18:06:25 -04:00
parent d1c069ad1e
commit f6c20ad314
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
View File

@ -38,14 +38,8 @@ public class JpaUtil {
} }
public static <T, I> T saveOrUpdate(I id, EntityManager entityManager, T entity) { public static <T, I> T saveOrUpdate(I id, EntityManager entityManager, T entity) {
if (id == null) { T tmp = entityManager.merge(entity);
entityManager.persist(entity); entityManager.flush();
entityManager.flush(); return tmp;
return entity;
} else {
T tmp = entityManager.merge(entity);
entityManager.flush();
return tmp;
}
} }
} }