HHH-17504 - Ongoing JPA 32 work HHH-17350 - Work on hibernate-models,…

… XSD and JAXB HHH-16114 - Improve boot metamodel binding HHH-15996 - Develop an abstraction for Annotation in annotation processing HHH-16012 - Develop an abstraction for domain model Class refs HHH-15997 - Support for dynamic models in orm.xml HHH-15698 - Support for entity-name in mapping.xsd

hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java

@@ -2259,12 +2259,12 @@ private void handleElementCollection(TypeDetails elementType, String hqlOrderBy)
 		// 'holder' is the CollectionPropertyHolder.
 		// 'property' is the collection XProperty
 
-		final ClassDetails elementClass = isPrimitive( elementType.getName() )
+		final boolean isPrimitive = isPrimitive( elementType.getName() );
+		final ClassDetails elementClass = isPrimitive
 				? null
 				: elementType.determineRawClass();
-		final AnnotatedClassType classType = annotatedElementType( isEmbedded, property, elementClass );
-		final boolean primitive = classType == NONE;
-		if ( !primitive ) {
+		final AnnotatedClassType classType = annotatedElementType( isEmbedded, isPrimitive, property, elementClass );
+		if ( !isPrimitive ) {
 			propertyHolder.startingProperty( property );
 		}
 
@@ -2388,9 +2388,10 @@ static AccessType accessType(MemberDetails property, PersistentClass owner) {
 
 	private AnnotatedClassType annotatedElementType(
 			boolean isEmbedded,
+			boolean isPrimitive,
 			MemberDetails property,
 			ClassDetails elementClass) {
-		if ( isPrimitive( elementClass.getName() ) ) {
+		if ( isPrimitive ) {
 			return NONE;
 		}
 		else {