From f9fd2e35894df6149885696704c7078d2d251e28 Mon Sep 17 00:00:00 2001
From: Laurent Klock <Laurent.Klock@arhs-cube.com>
Date: Mon, 24 Jul 2023 11:20:25 +0200
Subject: [PATCH] HHH-16977: Fixed in NullPointerException in
 EntityEntryContext.downgradeLocks

---
 .../org/hibernate/engine/internal/EntityEntryContext.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
index a532a17927..6ca1237926 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
@@ -370,7 +370,10 @@ public class EntityEntryContext {
 
 		ManagedEntity node = head;
 		while ( node != null ) {
-			node.$$_hibernate_getEntityEntry().setLockMode( LockMode.NONE );
+			EntityEntry entityEntry = node.$$_hibernate_getEntityEntry();
+			if (entityEntry != null) {
+				entityEntry.setLockMode( LockMode.NONE ); 
+			}
 
 			node = node.$$_hibernate_getNextManagedEntity();
 		}
-- 
2.21.0.windows.1