Fixed assertion errors and session.merge returning correct exceptions.

Author: Naros

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -855,6 +855,7 @@ private Object fireMerge(MergeEvent event) {
 			for ( MergeEventListener listener : listeners( EventType.MERGE ) ) {
 				listener.onMerge( event );
 			}
+			checkNoUnresolvedActionsAfterOperation();
 		}
 		catch ( ObjectDeletedException sse ) {
 			throw convert( new IllegalArgumentException( sse ) );
@@ -866,9 +867,6 @@ private Object fireMerge(MergeEvent event) {
 			//including HibernateException
 			throw convert( e );
 		}
-		finally {
-			checkNoUnresolvedActionsAfterOperation();
-		}
 
 		return event.getResult();
 	}

hibernate-core/src/test/java/org/hibernate/test/cascade/MultiPathCascadeTest.java

@@ -176,9 +176,9 @@ public void testMultiPathMergeNonCascadedTransientEntityInCollection() throws Ex
 			s.merge( a );
 			s.merge( h );
 			s.getTransaction().commit();
-			fail( "should have thrown TransientObjectException" );
+			fail( "should have thrown IllegalStateException" );
 		}
-		catch (TransientObjectException expected) {
+		catch (IllegalStateException expected) {
 			// expected
 		}
 		finally {
@@ -225,9 +225,9 @@ public void testMultiPathMergeNonCascadedTransientEntityInOneToOne() throws Exce
 			s.merge( a );
 			s.merge( g );
 			s.getTransaction().commit();
-			fail( "should have thrown TransientObjectException" );
+			fail( "should have thrown IllegalStateException" );
 		}
-		catch (TransientObjectException expected) {
+		catch (IllegalStateException expected) {
 			// expected
 		}
 		finally {
@@ -274,9 +274,9 @@ public void testMultiPathMergeNonCascadedTransientEntityInManyToOne() throws Exc
 			s.merge( a );
 			s.merge( h );
 			s.getTransaction().commit();
-			fail( "should have thrown TransientObjectException" );
+			fail( "should have thrown IllegalStateException" );
 		}
-		catch (TransientObjectException expected) {
+		catch (IllegalStateException expected) {
 			// expected
 		}
 		finally {

hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java

@@ -8,6 +8,8 @@
 
 import java.util.Iterator;
 
+import javax.persistence.PersistenceException;
+
 import org.junit.Test;
 
 import org.hibernate.JDBCException;
@@ -19,6 +21,7 @@
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
+import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
@@ -49,17 +52,26 @@
  */
 public class MultiPathCircleCascadeTest extends BaseCoreFunctionalTestCase {
 	private static interface EntityOperation {
+		boolean isLegacy();
 		Object doEntityOperation(Object entity, Session s);
 	}
 	private static EntityOperation MERGE_OPERATION =
 			new EntityOperation() {
+				@Override
+				public boolean isLegacy() {
+					return false;
+				}
 				@Override
 				public Object doEntityOperation(Object entity, Session s) {
 					return s.merge( entity );
 				}
 			};
 	private static EntityOperation SAVE_OPERATION =
 			new EntityOperation() {
+				@Override
+				public boolean isLegacy() {
+					return true;
+				}
 				@Override
 				public Object doEntityOperation(Object entity, Session s) {
 					s.save( entity );
@@ -68,6 +80,10 @@ public Object doEntityOperation(Object entity, Session s) {
 			};
 	private static EntityOperation SAVE_UPDATE_OPERATION =
 			new EntityOperation() {
+				@Override
+				public boolean isLegacy() {
+					return true;
+				}
 				@Override
 				public Object doEntityOperation(Object entity, Session s) {
 					s.saveOrUpdate( entity );
@@ -124,7 +140,8 @@ private void testEntityWithNonNullableTransientEntity(EntityOperation operation)
 			checkExceptionFromNullValueForNonNullable(
 					ex,
 					((SessionImplementor) s).getFactory().getSettings().isCheckNullability(),
-					false
+					false,
+					operation.isLegacy()
 			);
 		}
 		finally {
@@ -165,7 +182,8 @@ private void testEntityWithNonNullableEntityNull(EntityOperation operation) {
 			checkExceptionFromNullValueForNonNullable(
 					ex,
 					((SessionImplementor) s).getFactory().getSettings().isCheckNullability(),
-					true
+					true,
+					operation.isLegacy()
 			);
 		}
 		finally {
@@ -204,7 +222,8 @@ private void testEntityWithNonNullablePropSetToNull(EntityOperation operation) {
 			checkExceptionFromNullValueForNonNullable(
 					ex,
 					((SessionImplementor) s).getFactory().getSettings().isCheckNullability(),
-					true
+					true,
+					operation.isLegacy()
 			);
 		}
 		finally {
@@ -660,18 +679,28 @@ private void testData3Nodes(EntityOperation operation) {
 	}
 
 	protected void checkExceptionFromNullValueForNonNullable(
-			Exception ex, boolean checkNullability, boolean isNullValue
+			Exception ex, boolean checkNullability, boolean isNullValue, boolean isLegacy
 	) {
 		if ( isNullValue ) {
 			if ( checkNullability ) {
-				assertTrue( ex instanceof PropertyValueException );
+                if ( isLegacy ) {
+					assertTyping( PropertyValueException.class, ex );
+				}
+				else {
+					assertTyping( PersistenceException.class, ex );
+				}
 			}
 			else {
 				assertTrue( (ex instanceof JDBCException) || (ex.getCause() instanceof JDBCException) );
 			}
 		}
 		else {
-			assertTrue( ex instanceof TransientPropertyValueException );
+			if ( isLegacy ) {
+				assertTyping( TransientPropertyValueException.class, ex );
+			}
+			else {
+				assertTyping( IllegalStateException.class, ex );
+			}
 		}
 	}