HHH-19056 Prevent NPE when using @MapsId on an embeddable #11025
+233
−2
Conversation
This file contains hidden or 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
mbellade
reviewed
Sep 29, 2025
Comment on lines
135
to
138
| Object context = generationContextLocator.locateGenerationContext( session, object ); | ||
| if ( context == null ) { | ||
| context = getDefaultSupplier( compositeType.getReturnedClass() ).get(); | ||
| } |
There was a problem hiding this comment.
Using getDefaultSupplier here is not correct, we should rather retrieve the embedded identifier's EmbeddableRepresentationStrategy. You should be able to retrieve it from the entity persister, by looking at its identifier attribute - we should also check we're in this "special" mapsid with null embedded id case.
I would also keep this logic under generationContextLocator.locateGenerationContext, but that's just a detail.
…iate when @mapsid is present
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.
https://hibernate.atlassian.net/browse/HHH-19056
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.