Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15229 Query returns null for broken foreign key reference and NotFoundAction.EXCEPTION

This commit is contained in:
Andrea Boriero 2022-05-03 17:39:51 +02:00 committed by Christian Beikov
parent 0ce120a344
commit 29848043b6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -25,6 +25,7 @@ import java.util.Set;
import jakarta.persistence.metamodel.Metamodel;
import org.hibernate.CacheMode;
import org.hibernate.ConnectionAcquisitionMode;
import org.hibernate.FetchNotFoundException;
import org.hibernate.Filter;
import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
@ -2332,7 +2333,14 @@ public class SessionImpl
return loadAccess.load( primaryKey );
}
catch ( EntityNotFoundException ignored ) {
catch (EntityNotFoundException entityNotFoundException) {
/*
This may happen if the entity has an associations mapped with @NotFound(action = NotFoundAction.EXCEPTION)
and this associated entity is not found.
*/
if ( entityNotFoundException instanceof FetchNotFoundException ) {
throw entityNotFoundException;
}
// DefaultLoadEventListener#returnNarrowedProxy() may throw ENFE (see HHH-7861 for details),
// which find() should not throw. Find() should return null if the entity was not found.
if ( log.isDebugEnabled() ) {