Skip to content
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

Jump to bottom

Return null early in the event of the CollectionEntry being null. #3499

Closed
wants to merge 1 commit into from
Closed

Return null early in the event of the CollectionEntry being null. #3499

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
View file
Open in desktop
Expand Up @@ -846,7 +846,7 @@ public Object getCollectionOwner(Serializable key, CollectionPersister collectio
@Override
public Object getLoadedCollectionOwnerOrNull(PersistentCollection collection) {
final CollectionEntry ce = getCollectionEntry( collection );
if ( ce.getLoadedPersister() == null ) {
if ( ce == null || ce.getLoadedPersister() == null ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the fix does make sense for the getCollectionEntry() might return null from its code

@Override
public Object getLoadedCollectionOwnerOrNull(PersistentCollection collection) {
	final CollectionEntry ce = getCollectionEntry( collection );
	if ( ce.getLoadedPersister() == null ) {
		return null;
	}

An inspiring ticket for it exposed some generic NPE issue. Wondering whether some automatic tool (as primitive as Intellij's Inspect Code) could help to spot such issue.

return null;
}

Expand Down