From a34c99a34c3b052b67578d00f7c590dacc99774b Mon Sep 17 00:00:00 2001
From: Strong Liu <stliu@hibernate.org>
Date: Fri, 30 Sep 2011 17:09:07 +0800
Subject: [PATCH] HHH-6697 EntityManager.persist should through
 EntityExistsException instead of PersistenceException (from
 https://github.com/hibernate/hibernate-core/pull/178)

---
 .../src/test/resources/ehcache.xml            |  2 +-
 .../ejb/AbstractEntityManagerImpl.java        |  6 +++
 .../hibernate/ejb/test/EntityManagerTest.java | 39 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/hibernate-ehcache/src/test/resources/ehcache.xml b/hibernate-ehcache/src/test/resources/ehcache.xml
index a563bf9f02..11fddc733d 100644
--- a/hibernate-ehcache/src/test/resources/ehcache.xml
+++ b/hibernate-ehcache/src/test/resources/ehcache.xml
@@ -32,7 +32,7 @@
          user.home - User's home directory
          user.dir - User's current working directory
          java.io.tmpdir - Default temp file path -->
-    <diskStore path="hibernate-ehcache/target/tmp"/>
+    <diskStore path="./target/tmp"/>
 
 
     <!--Default Cache configuration. These will applied to caches programmatically created through
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
index 5a51b3396c..a418c48fc7 100755
--- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
@@ -25,6 +25,7 @@
 
 import javax.persistence.CacheRetrieveMode;
 import javax.persistence.CacheStoreMode;
+import javax.persistence.EntityExistsException;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.EntityTransaction;
@@ -1320,6 +1321,11 @@ else if ( e instanceof ObjectNotFoundException ) {
 			handlePersistenceException( converted );
 			return converted;
 		}
+        else if ( e instanceof org.hibernate.NonUniqueObjectException ) {
+            EntityExistsException converted = new EntityExistsException( e.getMessage() );
+            handlePersistenceException( converted );
+            return converted;
+        }
 		else if ( e instanceof org.hibernate.NonUniqueResultException ) {
 			NonUniqueResultException converted = new NonUniqueResultException( e.getMessage() );
 			handlePersistenceException( converted );
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java
index 6664c596c1..a414699323 100755
--- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java
@@ -24,9 +24,11 @@
  */
 package org.hibernate.ejb.test;
 
+import javax.persistence.EntityExistsException;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.FlushModeType;
+import javax.persistence.PersistenceException;
 import javax.persistence.Query;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -318,7 +320,7 @@ public void testIsOpen() throws Exception {
 	public void testGet() throws Exception {
 		EntityManager em = getOrCreateEntityManager();
 		em.getTransaction().begin();
-		Item item = ( Item ) em.getReference( Item.class, "nonexistentone" );
+		Item item = em.getReference( Item.class, "nonexistentone" );
 		try {
 			item.getDescr();
 			em.getTransaction().commit();
@@ -391,4 +393,39 @@ public void testSetProperty() throws Exception {
 		assertEquals( "MANUAL", em.getProperties().get( AvailableSettings.FLUSH_MODE ) );
 		em.close();
 	}
+
+    @Test
+    public void testPersistExisting() throws Exception {
+        EntityManager em = getOrCreateEntityManager();
+        em.getTransaction().begin();
+        Wallet w = new Wallet();
+        w.setBrand( "Lacoste" );
+        w.setModel( "Minimic" );
+        w.setSerial( "0100202002" );
+        em.persist( w );
+        w = new Wallet();
+        w.setBrand( "Lacoste" );
+        w.setModel( "Minimic" );
+        w.setSerial( "0100202002" );
+        try {
+            em.persist( w );
+        }
+        catch ( EntityExistsException eee ) {
+            //success
+            if ( em.getTransaction() != null ) {
+                em.getTransaction().rollback();
+            }
+            em.close();
+            return;
+        }
+        try {
+            em.getTransaction().commit();
+            fail( "Should have raised an exception" );
+        }
+        catch ( PersistenceException pe ) {
+        }
+        finally {
+            em.close();
+        }
+    }
 }