HHH-14826 Fix regression caused by one-to-one L2 cache support

cristatus · Sanne · commit a652822ff5f5 · 2021-09-20T22:39:38.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
@@ -219,7 +219,7 @@ public Object assemble(Serializable oid, SharedSessionContractImplementor sessio
 		Serializable id = ( Serializable ) getIdentifierType( session ).assemble( oid, session, null );
 
 		if ( id == null ) {
-			return null;
+			return resolve( session.getContextEntityIdentifier(owner), session, owner );
 		}
 
 		return resolveIdentifier( id, session );

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public Object assemble(Serializable oid, SharedSessionContractImplementor sessio`
`219`	`219`	`Serializable id = ( Serializable ) getIdentifierType( session ).assemble( oid, session, null );`
`220`	`220`
`221`	`221`	`if ( id == null ) {`
`222`		`- return null;`
	`222`	`+ return resolve( session.getContextEntityIdentifier(owner), session, owner );`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`return resolveIdentifier( id, session );`