HHH-19631 - Improve error handling of null Persister in lazy loading collections

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java

@@ -163,6 +163,7 @@ protected boolean readSize() {
 									session.getPersistenceContextInternal().getCollectionEntry( this );
 							if ( entry != null ) {
 								final CollectionPersister persister = entry.getLoadedPersister();
+								checkPersister( this, persister );
 								if ( persister.isExtraLazy() ) {
 									// TODO: support for extra-lazy collections was
 									//       dropped so this code should be obsolete
@@ -331,6 +332,7 @@ protected Boolean readIndexExistence(final Object index) {
 					() -> {
 						final CollectionEntry entry = session.getPersistenceContextInternal().getCollectionEntry( this );
 						final CollectionPersister persister = entry.getLoadedPersister();
+						checkPersister( this, persister );
 						if ( persister.isExtraLazy() ) {
 							if ( hasQueuedOperations() ) {
 								session.flush();
@@ -353,6 +355,7 @@ protected Boolean readElementExistence(final Object element) {
 					() -> {
 						final CollectionEntry entry = session.getPersistenceContextInternal().getCollectionEntry( this );
 						final CollectionPersister persister = entry.getLoadedPersister();
+						checkPersister( this, persister );
 						if ( persister.isExtraLazy() ) {
 							if ( hasQueuedOperations() ) {
 								session.flush();
@@ -399,6 +402,7 @@ public Object doWork() {
 							session.getPersistenceContextInternal()
 									.getCollectionEntry( AbstractPersistentCollection.this );
 					final CollectionPersister persister = entry.getLoadedPersister();
+					checkPersister( AbstractPersistentCollection.this, persister );
 					isExtraLazy = persister.isExtraLazy();
 					if ( isExtraLazy ) {
 						if ( hasQueuedOperations() ) {
@@ -646,12 +650,22 @@ private void throwLazyInitializationExceptionIfNotConnected() {
 	}
 
 	private void throwLazyInitializationException(String message) {
+		throwLazyInitializationException( role, message);
+	}
+
+	private static void throwLazyInitializationException(String role, String message) {
 		throw new LazyInitializationException(
 				String.format( "Cannot lazily initialize collection%s (%s)",
 						role == null ? "" : " of role '" + role + "'", message )
 		);
 	}
 
+	public static void checkPersister(PersistentCollection collection, CollectionPersister persister) {
+		if ( !collection.wasInitialized() && persister == null ) {
+			throwLazyInitializationException( null, "collection is being removed" );
+		}
+	}
+
 	protected final void setInitialized() {
 		this.initializing = false;
 		this.initialized = true;

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java

@@ -17,6 +17,7 @@
 import org.hibernate.sql.results.internal.ResultsHelper;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
+import static org.hibernate.collection.spi.AbstractPersistentCollection.checkPersister;
 import static org.hibernate.loader.internal.CacheLoadHelper.initializeCollectionFromCache;
 import static org.hibernate.pretty.MessageHelper.collectionInfoString;
 
@@ -41,6 +42,7 @@ public void onInitializeCollection(InitializeCollectionEvent event) throws Hiber
 		}
 		if ( !collection.wasInitialized() ) {
 			final CollectionPersister loadedPersister = ce.getLoadedPersister();
+			checkPersister(collection, loadedPersister);
 			final Object loadedKey = ce.getLoadedKey();
 			if ( LOG.isTraceEnabled() ) {
 				LOG.trace( "Initializing collection "