From 8e944ab0e06200e86c81dae5b6007222ec180ef1 Mon Sep 17 00:00:00 2001
From: Chris Cranford <chris@hibernate.org>
Date: Wed, 1 Feb 2017 12:51:06 -0500
Subject: [PATCH] HHH-10537 - Fixed conflict while merging changes from
 HHH-10557.

(cherry picked from commit 3f1111ee5c3dcb646df7c1a75f462d51229cab2c)
---
 .../test/hql/CollectionMapWithComponentValueTest.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java
index 51c3459615..f9a7ba45bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java
@@ -74,7 +74,7 @@ public class CollectionMapWithComponentValueTest extends BaseCoreFunctionalTestC
 			s.save( baseTestEntity2 );
 			TestEntity testEntity2 = new TestEntity();
 			Map<KeyValue, EmbeddableValue> map2 = new HashMap<>();
-			map.put( keyValue2, embeddableValue );
+			map2.put( keyValue2, embeddableValue );
 			testEntity2.values = map2;
 			s.save( testEntity2 );
 		}
@@ -221,6 +221,7 @@ public class CollectionMapWithComponentValueTest extends BaseCoreFunctionalTestC
 		{
 			// Assert that a left join is used for joining the map key entity table
 			List keyValues= s.createQuery( "select key(v) from BaseTestEntity bte left join bte.entities te left join te.values v" ).list();
+			System.out.println( keyValues );
 			assertEquals( 2, keyValues.size() );
 		}
 		s.getTransaction().commit();