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

HHH-14827 Fix @AttributeOverride at type level being ignored when also using orm.xml

This commit is contained in:
Yoann Rodière 2021-09-16 10:50:56 +02:00
parent 1582d8acc0
commit fba81d165a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java
View File

@ -1880,9 +1880,10 @@ public class JPAXMLOverriddenAnnotationReader implements AnnotationReader {
} }
private AttributeOverrides getAttributeOverrides(ManagedType root, XMLContext.Default defaults) { private AttributeOverrides getAttributeOverrides(ManagedType root, XMLContext.Default defaults) {
return root instanceof JaxbEntity return getAttributeOverrides(
? getAttributeOverrides( ( (JaxbEntity) root ).getAttributeOverride(), defaults, true ) root instanceof JaxbEntity ? ( (JaxbEntity) root ).getAttributeOverride() : Collections.emptyList(),
: null; defaults, true
);
} }
/** /**