From f6c20ad3148e24503a9b45b154aacf89c3f2894a Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Thu, 9 Jul 2015 18:06:25 -0400
Subject: [PATCH] changed to using merge() in JPA instead of persist()

---
 .../src/main/java/org/mitre/util/jpa/JpaUtil.java    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java b/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
index 243823195..835e4be1d 100644
--- a/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
+++ b/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
@@ -38,14 +38,8 @@ public class JpaUtil {
 	}
 
 	public static <T, I> T saveOrUpdate(I id, EntityManager entityManager, T entity) {
-		if (id == null) {
-			entityManager.persist(entity);
-			entityManager.flush();
-			return entity;
-		} else {
-			T tmp = entityManager.merge(entity);
-			entityManager.flush();
-			return tmp;
-		}
+		T tmp = entityManager.merge(entity);
+		entityManager.flush();
+		return tmp;
 	}
 }