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

(cherry picked from commit 148b4b2ed009b488206b8e3854bc7270dc7931b4)
This commit is contained in:
Gail Badner 2019-08-25 22:32:31 -07:00
parent a4c7d025da
commit 631a2645a8

View File

@ -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 );
}