Skip to content

HHH-15050 Fix NullPointerException in StatefulPersistenceContext.extractNaturalIdValues() #4706

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

Closed
garydgregory wants to merge 1 commit into from
Closed

HHH-15050 Fix NullPointerException in StatefulPersistenceContext.extractNaturalIdValues() #4706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 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 @@ -2160,6 +2160,9 @@ public Serializable findCachedNaturalIdResolution(EntityPersister persister, Obj
@Override
public Object[] extractNaturalIdValues(Object[] state, EntityPersister persister) {
final int[] naturalIdPropertyIndexes = persister.getNaturalIdentifierProperties();
if ( state == null || naturalIdPropertyIndexes == null ) {
return new Object[0];
}
if ( state.length == naturalIdPropertyIndexes.length ) {
return state;
}
Expand All @@ -2181,6 +2184,9 @@ public Object[] extractNaturalIdValues(Object entity, EntityPersister persister)
}

final int[] naturalIdentifierProperties = persister.getNaturalIdentifierProperties();
if ( naturalIdentifierProperties == null ) {
return new Object[0];
}
final Object[] naturalIdValues = new Object[naturalIdentifierProperties.length];

for ( int i = 0; i < naturalIdentifierProperties.length; i++ ) {
Expand Down