Skip to content

remove todo #9482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2024
Merged

remove todo #9482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883b4c5
very minor changes
gavinking Dec 20, 2024
bd1c437
remove a TODO
gavinking Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,6 @@ private boolean isNonDirtyViaCustomStrategy(Object entity) {
asPersistentAttributeInterceptable( entity ).$$_hibernate_getInterceptor();
if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor ) {
// we never have to check an uninitialized proxy
// TODO: why do we not check !lazinessInterceptor.hasWrittenFieldNames()
// as we do below in isNonDirtyViaTracker() ?
return true;
}
}
Expand Down
9 changes: 6 additions & 3 deletions ...re/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
import org.hibernate.type.descriptor.java.JavaType;

import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;

/**
* @author Steve Ebersole
Expand Down Expand Up @@ -496,7 +498,7 @@ public Object getAssociationKeyFromSide(
if ( targetObject == null ) {
return null;
}
final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( targetObject );
final LazyInitializer lazyInitializer = extractLazyInitializer( targetObject );
if ( lazyInitializer != null ) {
if ( refersToPrimaryKey ) {
return lazyInitializer.getIdentifier();
Expand All @@ -510,10 +512,11 @@ public Object getAssociationKeyFromSide(
return ( (EntityIdentifierMapping) modelPart ).getIdentifierIfNotUnsaved( targetObject, session );
}

if ( lazyInitializer == null && ManagedTypeHelper.isPersistentAttributeInterceptable( targetObject ) ) {
if ( lazyInitializer == null && isPersistentAttributeInterceptable( targetObject ) ) {
final PersistentAttributeInterceptor interceptor =
asPersistentAttributeInterceptable( targetObject ).$$_hibernate_getInterceptor();
if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor && !( (EnhancementAsProxyLazinessInterceptor) interceptor ).isInitialized() ) {
if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor lazinessInterceptor
&& !lazinessInterceptor.isInitialized() ) {
Hibernate.initialize( targetObject );
}
}
Expand Down
Loading