Skip to content

HHH-19582 NullPointerException in org.hibernate.internal.util.collections.AbstractPagedArray#clear (backport from main) #10503

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
Jul 10, 2025
Merged

HHH-19582 NullPointerException in org.hibernate.internal.util.collections.AbstractPagedArray#clear (backport from main) #10503

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
fd511c0
HHH-19582 - Fix NPE
jrenaat Jul 9, 2025
c0a449d
HHH-19582 - Add test for issue
jrenaat Jul 9, 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
4 changes: 3 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/internal/util/collections/AbstractPagedArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ protected Page<E> getOrCreateEntryPage(int index) {

public void clear() {
for ( Page<E> entryPage : elementPages ) {
entryPage.clear();
if ( entryPage != null ) {
entryPage.clear();
}
}
elementPages.clear();
elementPages.trimToSize();
Expand Down
12 changes: 12 additions & 0 deletions hibernate-core/src/test/java/org/hibernate/orm/test/util/InstanceIdentityMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import org.hibernate.engine.spi.InstanceIdentity;
import org.hibernate.internal.util.collections.InstanceIdentityMap;
import org.hibernate.testing.orm.junit.Jira;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -99,4 +100,15 @@ public void testSets() {
assertThat( testMap.values() ).hasSize( 100 ).containsAll( map.values() );
assertThat( testMap.entrySet() ).hasSize( 100 ).containsAll( map.entrySet() );
}

@Test
@Jira(value = "https://hibernate.atlassian.net/browse/HHH-19582")
public void testNullPage() {
final TestInstance i1 = new TestInstance( 9999 );
testMap.put( i1, "instance_X" );

testMap.clear();
assertThat( testMap ).isEmpty();
}

}