HHH-19248 Return of deleted entities doesn't work with naturalid multiloading #9924
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...rnate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java
Dismissed
Show dismissed
Hide dismissed
...rnate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java
Fixed
Show fixed
Hide fixed
jrenaat
force-pushed
the
HHH-19248_multinaturalid
branch
2 times, most recently
from
7a7f8d6 to
3771c29
Compare
Signed-off-by: Jan Schatteman <[email protected]>
Signed-off-by: Jan Schatteman <[email protected]>
jrenaat
force-pushed
the
HHH-19248_multinaturalid
branch
from
3771c29 to
f9a8c34
Compare
jrenaat
changed the title
gavinking
reviewed
Apr 4, 2025
Comment on lines
+141
to
+186
| protected void performAnyNeededCrossReferenceSynchronizations() { | ||
| final NaturalIdMapping naturalIdMapping = entityDescriptor.getNaturalIdMapping(); | ||
|
|
||
| if ( !naturalIdMapping.isMutable() ) { | ||
| // only mutable natural-ids need this processing | ||
| return; | ||
| } | ||
|
|
||
| if ( ! session.isTransactionInProgress() ) { | ||
| // not in a transaction so skip synchronization | ||
| return; | ||
| } | ||
|
|
||
| final PersistenceContext persistenceContext = session.getPersistenceContextInternal(); | ||
| final Collection<?> cachedPkResolutions = | ||
| persistenceContext.getNaturalIdResolutions() | ||
| .getCachedPkResolutions( entityDescriptor ); | ||
| final boolean loggerDebugEnabled = LoaderLogging.LOADER_LOGGER.isDebugEnabled(); | ||
| for ( Object pk : cachedPkResolutions ) { | ||
| final EntityKey entityKey = session.generateEntityKey( pk, entityDescriptor ); | ||
| final Object entity = persistenceContext.getEntity( entityKey ); | ||
| final EntityEntry entry = persistenceContext.getEntry( entity ); | ||
|
|
||
| if ( entry == null ) { | ||
| if ( loggerDebugEnabled ) { | ||
| LoaderLogging.LOADER_LOGGER.debugf( | ||
| "Cached natural-id/pk resolution linked to null EntityEntry in persistence context : %s#%s", | ||
| entityDescriptor.getEntityName(), | ||
| pk | ||
| ); | ||
| } | ||
| continue; | ||
| } | ||
|
|
||
| if ( !entry.requiresDirtyCheck( entity ) ) { | ||
| continue; | ||
| } | ||
|
|
||
| // MANAGED is the only status we care about here... | ||
| if ( entry.getStatus() != Status.MANAGED ) { | ||
| continue; | ||
| } | ||
|
|
||
| persistenceContext.getNaturalIdResolutions().handleSynchronization( pk, entity, entityDescriptor ); | ||
| } | ||
| } |
There was a problem hiding this comment.
Is this just a copy/paste job from BaseNaturalIdLoadAccessImpl?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.
https://hibernate.atlassian.net/browse/HHH-19248