HHH-16977 Fixed in NullPointerException in EntityEntryContext.downgradeLocks

klockla · Sanne · commit bde1034aee8d · 2023-07-26T07:01:29.000-04: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
@@ -402,7 +402,10 @@ public void downgradeLocks() {
 	}
 
 	private static void downgradeLockOnManagedEntity(final ManagedEntity node) {
-		node.$$_hibernate_getEntityEntry().setLockMode( LockMode.NONE );
+		final EntityEntry entityEntry = node.$$_hibernate_getEntityEntry();
+		if ( entityEntry != null ) {
+			entityEntry.setLockMode( LockMode.NONE );
+		}
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,10 @@ public void downgradeLocks() {`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`private static void downgradeLockOnManagedEntity(final ManagedEntity node) {`
`405`		`- node.$$_hibernate_getEntityEntry().setLockMode( LockMode.NONE );`
	`405`	`+ final EntityEntry entityEntry = node.$$_hibernate_getEntityEntry();`
	`406`	`+ if ( entityEntry != null ) {`
	`407`	`+ entityEntry.setLockMode( LockMode.NONE );`
	`408`	`+ }`
`406`	`409`	`}`
`407`	`410`
`408`	`411`	`/**`