Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11037 - Same named subtype embeddable properties ignored

This commit is contained in:
Andrea Boriero 2016-08-15 18:47:09 +02:00 committed by Gail Badner
parent 3028f5d787
commit 62bfbf8bd9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
View File

@ -1614,13 +1614,15 @@ public final class AnnotationBinder {
MetadataBuildingContext context,
Map<XClass, InheritanceState> inheritanceStatePerClass) throws MappingException {
if ( entityBinder.isPropertyDefinedInSuperHierarchy( inferredData.getPropertyName() ) ) {
LOG.debugf(
"Skipping attribute [%s : %s] as it was already processed as part of super hierarchy",
inferredData.getClassOrElementName(),
inferredData.getPropertyName()
);
return;
if ( !propertyHolder.isComponent() ) {
if ( entityBinder.isPropertyDefinedInSuperHierarchy( inferredData.getPropertyName() ) ) {
LOG.debugf(
"Skipping attribute [%s : %s] as it was already processed as part of super hierarchy",
inferredData.getClassOrElementName(),
inferredData.getPropertyName()
);
return;
}
}
/**

4
hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java
View File

@ -175,9 +175,7 @@ public class EntityBinder {
if ( persistentClass == null ) {
return false;
}
return inheritanceState.getType() != InheritanceType.JOINED
&& persistentClass.isPropertyDefinedInSuperHierarchy( name );
return persistentClass.isPropertyDefinedInSuperHierarchy( name );
}
@SuppressWarnings("SimplifiableConditionalExpression")