Author: epbernard Date: 2010-02-05 07:35:18 -0500 (Fri, 05 Feb 2010) New Revision: 18701 Modified: core/trunk/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java Log: HHH-4848 simplify the non-jpa 2 case a bit further Modified: core/trunk/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java 2010-02-05 06:25:59 UTC (rev 18700) +++ core/trunk/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java 2010-02-05 12:35:18 UTC (rev 18701) @@ -307,17 +307,6 @@ public Object getIdentifier(Object entity, EntityMode entityMode, SessionFactoryImplementor factory) { Object id = mappedIdentifierType.instantiate( entityMode ); final Object[] propertyValues = virtualIdComponent.getPropertyValues( entity, entityMode ); - Type[] subTypes = virtualIdComponent.getSubtypes(); - Type[] copierSubTypes = mappedIdentifierType.getSubtypes(); - final int length = subTypes.length; - for ( int i = 0 ; i < length; i++ ) { - //JPA 2 in @IdClass points to the pk of the entity - if ( subTypes[i].isAssociationType() && ! copierSubTypes[i].isAssociationType()) { - final String associatedEntityName = ( ( EntityType ) subTypes[i] ).getAssociatedEntityName(); - final EntityPersister entityPersister = factory.getEntityPersister( associatedEntityName ); - propertyValues[i] = entityPersister.getIdentifier( propertyValues[i], entityMode ); - } - } mappedIdentifierType.setPropertyValues( id, propertyValues, entityMode ); return id; }