HHH-15453 java.lang.NullPointerException: Cannot invoke org.hibernate…

….engine.spi.EntityEntry.getEntityKey() because ownerEntry is null
hibernate · Aug 24, 2022 · d862b08 · d862b08
1 parent ed4f399
commit d862b08
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java
@@ -282,7 +282,11 @@ else if ( !session.isConnected() ) {
 				}
 			}
 			else {
-				if ( !session.isTransactionInProgress() ) {
+				/*
+				 Whenever the collection lazy loading is triggered during the loading process,
+				 closing the connection will cause an error when RowProcessingStateStandardImpl#next() will be called.
+				 */
+				if ( !session.isTransactionInProgress() && session.getPersistenceContext().isLoadFinished() ) {
 					session.getJdbcCoordinator().afterTransaction();
 				}
 			}

diff --git a/...va/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java b/...va/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
@@ -101,13 +101,23 @@ protected void resolveInstance(RowProcessingState rowProcessingState, boolean is
 
 			if ( loadingEntry != null ) {
 				collectionInstance = loadingEntry.getCollectionInstance();
+				if ( collectionInstance.getOwner() == null ) {
+					parentAccess.registerResolutionListener(
+							owner -> collectionInstance.setOwner( owner )
+					);
+				}
 				return;
 			}
 
 			final PersistentCollection<?> existing = persistenceContext.getCollection( collectionKey );
 
 			if ( existing != null ) {
 				collectionInstance = existing;
+				if ( collectionInstance.getOwner() == null ) {
+					parentAccess.registerResolutionListener(
+							owner -> collectionInstance.setOwner( owner )
+					);
+				}
 				return;
 			}