From 148b4b2ed009b488206b8e3854bc7270dc7931b4 Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Sun, 25 Aug 2019 22:32:31 -0700
Subject: [PATCH] HHH-13590 : TransientObjectException merging a non-proxy
 association to a proxy

---
 .../org/hibernate/event/internal/DefaultMergeEventListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
index 56326d172a..39f1f47b76 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
@@ -359,7 +359,7 @@ public class DefaultMergeEventListener extends AbstractSaveEventListener impleme
 			Object managed,
 			EntityPersister persister,
 			EventSource source) {
-		if ( incoming instanceof HibernateProxy ) {
+		if ( managed instanceof HibernateProxy ) {
 			return source.getPersistenceContextInternal().unproxy( managed );
 		}