HHH-15658 Embeddable with more fields than the parent fails with Inde…

…x out of Bounds
hibernate · Nov 22, 2022 · 2d44219 · 2d44219
1 parent 934bde2
commit 2d44219
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -2027,17 +2027,14 @@ else if ( fetchable instanceof Association ) {
 	}
 
 	private boolean isSelectable(FetchParent fetchParent, Fetchable fetchable) {
-		if ( fetchable instanceof AttributeMapping ) {
-			if ( fetchParent instanceof EmbeddableResultGraphNode
-					&& ( (EmbeddableResultGraphNode) fetchParent).getReferencedMappingContainer() == getIdentifierMapping() ) {
-				return true;
-			}
-			else {
-				final int propertyNumber = ( (AttributeMapping) fetchable).getStateArrayPosition();
+		if ( fetchParent instanceof EmbeddableResultGraphNode ) {
+			return true;
+		}
+		else if ( fetchable instanceof AttributeMapping ) {
+			final int propertyNumber = ( (AttributeMapping) fetchable ).getStateArrayPosition();
 //				final int tableNumber = getSubclassPropertyTableNumber( propertyNumber );
 //				return !isSubclassTableSequentialSelect( tableNumber ) && propertySelectable[propertyNumber];
-				return propertySelectable[propertyNumber];
-			}
+			return propertySelectable[propertyNumber];
 		}
 		else {
 			return true;