Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-09 12:44:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yoann Rodière 2021-09-16 10:50:56 +02:00
parent 170821c135
commit 70d7ac6ecd
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 @@ private void addAssociationOverrideIfNeeded(AssociationOverride annotation, List
}
private AttributeOverrides getAttributeOverrides(ManagedType root, XMLContext.Default defaults) {
return root instanceof JaxbEntity
? getAttributeOverrides( ( (JaxbEntity) root ).getAttributeOverride(), defaults, true )
: null;
return getAttributeOverrides(
root instanceof JaxbEntity ? ( (JaxbEntity) root ).getAttributeOverride() : Collections.emptyList(),
defaults, true
);
}
/**