Skip to content

HHH-19278 fixes to logic in MultiIdEntityLoaders #9887

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 6 commits into from
Mar 21, 2025
Merged

HHH-19278 fixes to logic in MultiIdEntityLoaders #9887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92b9100
HHH-19278 fix some logic in MultiIdEntityLoaders that just looks wrong
gavinking Mar 21, 2025
f9698b2
extremely minor changes to SqmUtil
gavinking Mar 21, 2025
57841ca
improve javadoc
gavinking Mar 21, 2025
fffe9d4
HHH-19278 rename impl class for consistency
gavinking Mar 21, 2025
4562974
HHH-19278 very minor code cleanups
gavinking Mar 21, 2025
97f4964
code cleanups to BatchFetchQueue
gavinking Mar 21, 2025
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
96 changes: 0 additions & 96 deletions hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,8 +931,8 @@ public Object proxyFor(EntityPersister persister, EntityKey key, Object impl) th

@Override
public Object proxyFor(Object impl) throws HibernateException {
final EntityEntry e = getEntry( impl );
return e == null ? impl : proxyFor( e.getPersister(), e.getEntityKey(), impl );
final EntityEntry entry = getEntry( impl );
return entry == null ? impl : proxyFor( entry.getPersister(), entry.getEntityKey(), impl );
}

@Override
Expand Down Expand Up @@ -1026,15 +1026,12 @@ public Object getLoadedCollectionOwnerOrNull(PersistentCollection<?> collection)
if ( ce == null || ce.getLoadedPersister() == null ) {
return null;
}

Object loadedOwner = null;
// TODO: an alternative is to check if the owner has changed; if it hasn't then
// return collection.getOwner()
final Object entityId = getLoadedCollectionOwnerIdOrNull( ce );
if ( entityId != null ) {
loadedOwner = getCollectionOwner( entityId, ce.getLoadedPersister() );
else {
// TODO: an alternative is to check if the owner has changed; if it hasn't then
// return collection.getOwner()
final Object entityId = getLoadedCollectionOwnerIdOrNull( ce );
return entityId != null ? getCollectionOwner( entityId, ce.getLoadedPersister() ) : null;
}
return loadedOwner;
}

@Override
Expand All @@ -1052,9 +1049,12 @@ private Object getLoadedCollectionOwnerIdOrNull(CollectionEntry ce) {
if ( ce == null || ce.getLoadedKey() == null || ce.getLoadedPersister() == null ) {
return null;
}
// TODO: an alternative is to check if the owner has changed; if it hasn't then
// get the ID from collection.getOwner()
return ce.getLoadedPersister().getCollectionType().getIdOfOwnerOrNull( ce.getLoadedKey(), session );
else {
// TODO: an alternative is to check if the owner has changed; if it hasn't then
// get the ID from collection.getOwner()
return ce.getLoadedPersister().getCollectionType()
.getIdOfOwnerOrNull( ce.getLoadedKey(), session );
}
}

@Override
Expand Down
Loading
Loading