From 153817f426aae6f71aa9299c542162746effe57e Mon Sep 17 00:00:00 2001
From: Jezza <jezzadabomb@gmail.com>
Date: Fri, 14 Aug 2020 10:58:01 +0200
Subject: [PATCH] HHH-14175
 StatefulPersistenceContext#getLoadedCollectionOwnerOrNull could NPE on
 missing CollectionEntry

Avoids NPE, as the collection entry could not exist.
---
 .../hibernate/engine/internal/StatefulPersistenceContext.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
index 2b83fb8a7f..ed0a5dc862 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
@@ -846,7 +846,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
 	@Override
 	public Object getLoadedCollectionOwnerOrNull(PersistentCollection collection) {
 		final CollectionEntry ce = getCollectionEntry( collection );
-		if ( ce.getLoadedPersister() == null ) {
+		if ( ce == null || ce.getLoadedPersister() == null ) {
 			return null;
 		}