mirror of
https://github.com/hibernate/hibernate-orm
synced 2025-02-17 16:44:57 +00:00
HHH-13590 : TransientObjectException merging a non-proxy association to a proxy
(cherry picked from commit 148b4b2ed009b488206b8e3854bc7270dc7931b4)
This commit is contained in:
parent
a4c7d025da
commit
631a2645a8
@ -374,7 +374,7 @@ private Object unproxyManagedForDetachedMerging(
|
||||
Object managed,
|
||||
EntityPersister persister,
|
||||
EventSource source) {
|
||||
if ( incoming instanceof HibernateProxy ) {
|
||||
if ( managed instanceof HibernateProxy ) {
|
||||
return source.getPersistenceContext().unproxy( managed );
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user