HHH-16839 Failing to update a one-to-one lazy association with and en…

…abled bytecode enhancement
hibernate · Jun 27, 2023 · 1980da7 · 1980da7
1 parent becb116
commit 1980da7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java b/...core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java
@@ -1076,6 +1076,7 @@ private void applyTableUpdateDetails(
 
 				if ( attributeAnalysis.includeInLocking() ) {
 					final boolean includeRestriction = includeInRestriction(
+							oldValues,
 							dirtinessChecker,
 							versionMapping,
 							versionability,
@@ -1155,18 +1156,23 @@ else if ( tableUpdateBuilder.getOptimisticLockBindings() != null ) {
 	}
 
 	private static boolean includeInRestriction(
+			Object[] oldValues,
 			DirtinessChecker dirtinessChecker,
 			EntityVersionMapping versionMapping,
 			boolean[] versionability,
 			OptimisticLockStyle optimisticLockStyle,
 			int attributeIndex,
 			AttributeMapping attributeMapping,
 			AttributeAnalysis attributeAnalysis) {
+
 		if ( optimisticLockStyle == OptimisticLockStyle.VERSION
 				&& versionMapping != null
 				&& attributeMapping == versionMapping.getVersionAttribute() ) {
 			return true;
 		}
+		else if ( oldValues == null ) {
+			return false;
+		}
 		else if ( optimisticLockStyle == OptimisticLockStyle.ALL ) {
 			return versionability[attributeIndex];
 		}