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

HHH-13590 : TransientObjectException merging a non-proxy association to a proxy

This commit is contained in:
Gail Badner 2019-08-25 22:32:31 -07:00 committed by gbadner
parent 11409ed633
commit 148b4b2ed0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
View File

@ -359,7 +359,7 @@ public class DefaultMergeEventListener extends AbstractSaveEventListener impleme
Object managed, Object managed,
EntityPersister persister, EntityPersister persister,
EventSource source) { EventSource source) {
if ( incoming instanceof HibernateProxy ) { if ( managed instanceof HibernateProxy ) {
return source.getPersistenceContextInternal().unproxy( managed ); return source.getPersistenceContextInternal().unproxy( managed );
} }