HHH-18500 If superclass is null, class should not be enhanced, simply return empty collection

cigaly · cigaly · commit 92f83ea188ac · 2024-08-20T12:01:22.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
@@ -148,7 +148,10 @@ private static Collection<AnnotatedFieldDescription> collectInheritPersistentFie
 		}
 		TypeDefinition managedCtSuperclass = managedCtClass.getSuperClass();
 
-		if ( enhancementContext.isEntityClass( managedCtSuperclass.asErasure() ) ) {
+		// If managedCtSuperclass is null, managedCtClass can be either interface or module-info.
+		// Interfaces are already filtered-out, and module-info does not have any fields to enhance
+		// so we can safely return empty list.
+		if ( managedCtSuperclass == null || enhancementContext.isEntityClass( managedCtSuperclass.asErasure() ) ) {
 			return Collections.emptyList();
 		}
 		else if ( !enhancementContext.isMappedSuperclassClass( managedCtSuperclass.asErasure() ) ) {

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,10 @@ private static Collection<AnnotatedFieldDescription> collectInheritPersistentFie`
`148`	`148`	`}`
`149`	`149`	`TypeDefinition managedCtSuperclass = managedCtClass.getSuperClass();`
`150`	`150`
`151`		`- if ( enhancementContext.isEntityClass( managedCtSuperclass.asErasure() ) ) {`
	`151`	`+ // If managedCtSuperclass is null, managedCtClass can be either interface or module-info.`
	`152`	`+ // Interfaces are already filtered-out, and module-info does not have any fields to enhance`
	`153`	`+ // so we can safely return empty list.`
	`154`	`+ if ( managedCtSuperclass == null \|\| enhancementContext.isEntityClass( managedCtSuperclass.asErasure() ) ) {`
`152`	`155`	`return Collections.emptyList();`
`153`	`156`	`}`
`154`	`157`	`else if ( !enhancementContext.isMappedSuperclassClass( managedCtSuperclass.asErasure() ) ) {`