HHH-7912 - Define edge-case behavior for Session.evict

sebersole · sebersole · commit 0ffe6e711502 · 2013-01-08T21:40:33.000-06:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
@@ -1,7 +1,7 @@
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
- * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * Copyright (c) 2013, Red Hat Inc. or third-party contributors as
  * indicated by the @author tags or express copyright attribution
  * statements applied by the authors.  All third-party contributions are
  * distributed under license by Red Hat Inc.
@@ -163,7 +163,7 @@ else if ( nonEnhancedEntityXref == null ) {
 		}
 
 		if ( managedEntity == null ) {
-			throw new AssertionFailure( "Unable to resolve entity reference to EntityEntry for removal" );
+			return null;
 		}
 
 		// prepare for re-linking...

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Hibernate, Relational Persistence for Idiomatic Java`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2012, Red Hat Inc. or third-party contributors as`
	`4`	`+ * Copyright (c) 2013, Red Hat Inc. or third-party contributors as`
`5`	`5`	`* indicated by the @author tags or express copyright attribution`
`6`	`6`	`* statements applied by the authors. All third-party contributions are`
`7`	`7`	`* distributed under license by Red Hat Inc.`
`@@ -163,7 +163,7 @@ else if ( nonEnhancedEntityXref == null ) {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if ( managedEntity == null ) {`
`166`		`- throw new AssertionFailure( "Unable to resolve entity reference to EntityEntry for removal" );`
	`166`	`+ return null;`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`// prepare for re-linking...`