Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17828 Special case for uninitialized enhanced proxies when locking

This commit is contained in:
Marco Belladelli 2024-03-21 11:27:00 +01:00
parent fbd170b853
commit dc71c17503
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
View File

@ -9,6 +9,7 @@ package org.hibernate.loader.ast.internal;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.List; import java.util.List;
import org.hibernate.Hibernate;
import org.hibernate.LockMode; import org.hibernate.LockMode;
import org.hibernate.LockOptions; import org.hibernate.LockOptions;
import org.hibernate.ObjectDeletedException; import org.hibernate.ObjectDeletedException;
@ -26,6 +27,7 @@ import org.hibernate.metamodel.mapping.BasicValuedModelPart;
import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMapping;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.pretty.MessageHelper;
import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.expression.JdbcParameter;
import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.ast.tree.select.SelectStatement;
import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl; import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
@ -82,6 +84,21 @@ public class LoaderHelper {
lock = cache.lockItem( session, ck, entry.getVersion() ); lock = cache.lockItem( session, ck, entry.getVersion() );
} }
if ( persister.isVersioned() && entry.getVersion() == null ) {
// This should be an empty entry created for an uninitialized bytecode proxy
if ( !Hibernate.isPropertyInitialized( object, persister.getVersionMapping().getPartName() ) ) {
Hibernate.initialize( object );
entry = session.getPersistenceContextInternal().getEntry( object );
assert entry.getVersion() != null;
}
else {
throw new IllegalStateException( String.format(
"Trying to lock versioned entity %s but found null version",
MessageHelper.infoString( persister.getEntityName(), entry.getId() )
) );
}
}
if ( persister.isVersioned() && requestedLockMode == LockMode.PESSIMISTIC_FORCE_INCREMENT ) { if ( persister.isVersioned() && requestedLockMode == LockMode.PESSIMISTIC_FORCE_INCREMENT ) {
// todo : should we check the current isolation mode explicitly? // todo : should we check the current isolation mode explicitly?
Object nextVersion = persister.forceVersionIncrement( Object nextVersion = persister.forceVersionIncrement(
@ -101,7 +118,6 @@ public class LoaderHelper {
persister.getCacheAccessStrategy().unlockItem( session, ck, lock ); persister.getCacheAccessStrategy().unlockItem( session, ck, lock );
} }
} }
} }
} }