HHH-11037 - Same named subtype embeddable properties ignored
(cherry picked from commit 62bfbf8bd9
)
Conflicts:
hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java
This commit is contained in:
parent
840258a00e
commit
f446b0a35e
|
@ -1614,13 +1614,15 @@ public final class AnnotationBinder {
|
||||||
MetadataBuildingContext context,
|
MetadataBuildingContext context,
|
||||||
Map<XClass, InheritanceState> inheritanceStatePerClass) throws MappingException {
|
Map<XClass, InheritanceState> inheritanceStatePerClass) throws MappingException {
|
||||||
|
|
||||||
if ( entityBinder.isPropertyDefinedInSuperHierarchy( inferredData.getPropertyName() ) ) {
|
if ( !propertyHolder.isComponent() ) {
|
||||||
LOG.debugf(
|
if ( entityBinder.isPropertyDefinedInSuperHierarchy( inferredData.getPropertyName() ) ) {
|
||||||
"Skipping attribute [%s : %s] as it was already processed as part of super hierarchy",
|
LOG.debugf(
|
||||||
inferredData.getClassOrElementName(),
|
"Skipping attribute [%s : %s] as it was already processed as part of super hierarchy",
|
||||||
inferredData.getPropertyName()
|
inferredData.getClassOrElementName(),
|
||||||
);
|
inferredData.getPropertyName()
|
||||||
return;
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue