HHH-6500 : EntityBinding.getEntity().getSuperType() is null for subclass EntityBinding

Author: gbadner

hibernate-core/src/main/java/org/hibernate/metamodel/source/binder/Binder.java

@@ -201,7 +201,7 @@ private EntityBinding buildBasicEntityBinding(EntitySource entitySource, EntityB
 				entityName,
 				className,
 				currentBindingContext.makeClassReference( className ),
-				null
+				superEntityBinding == null ? null : superEntityBinding.getEntity()
 		);
 		entityBinding.setEntity( entity );
 

hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/InheritanceBindingTest.java

@@ -36,6 +36,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertSame;
 import static junit.framework.Assert.assertTrue;
@@ -58,6 +59,23 @@ public void testDiscriminatorValue() {
 		assertEquals( "Wrong discriminator value", "foo", entityBinding.getDiscriminatorMatchValue() );
 	}
 
+	@Test
+	@Resources(annotatedClasses = { RootOfSingleTableInheritance.class, SubclassOfSingleTableInheritance.class })
+	public void testSubclassEntitySuperType() {
+		EntityBinding entityBinding = getEntityBinding( SubclassOfSingleTableInheritance.class );
+		assertNotNull( entityBinding.getEntity().getSuperType() );
+		assertSame( RootOfSingleTableInheritance.class, entityBinding.getEntity().getSuperType().getClassReference() );
+		assertEquals( RootOfSingleTableInheritance.class.getName(), entityBinding.getEntity().getSuperType().getClassName() );
+		assertNull( entityBinding.getEntity().getSuperType().getSuperType() );
+	}
+
+	@Test
+	@Resources(annotatedClasses = { RootOfSingleTableInheritance.class, SubclassOfSingleTableInheritance.class })
+	public void testRootEntitySuperType() {
+		EntityBinding entityBinding = getEntityBinding( RootOfSingleTableInheritance.class );
+		assertNull( entityBinding.getEntity().getSuperType() );
+	}
+
 	@Test
 	@Resources(annotatedClasses = {
 			SubclassOfSingleTableInheritance.class,