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

yrodiere · yrodiere · commit 70d7ac6ecdb8 · 2021-09-16T16:23:00.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java
@@ -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
+		);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1880,9 +1880,10 @@ private void addAssociationOverrideIfNeeded(AssociationOverride annotation, List`
`1880`	`1880`	`}`
`1881`	`1881`
`1882`	`1882`	`private AttributeOverrides getAttributeOverrides(ManagedType root, XMLContext.Default defaults) {`
`1883`		`- return root instanceof JaxbEntity`
`1884`		`- ? getAttributeOverrides( ( (JaxbEntity) root ).getAttributeOverride(), defaults, true )`
`1885`		`- : null;`
	`1883`	`+ return getAttributeOverrides(`
	`1884`	`+ root instanceof JaxbEntity ? ( (JaxbEntity) root ).getAttributeOverride() : Collections.emptyList(),`
	`1885`	`+ defaults, true`
	`1886`	`+ );`
`1886`	`1887`	`}`
`1887`	`1888`
`1888`	`1889`	`/**`