Skip to content

Commit 4f9e5c1

Browse files
scottmarlowmbellade
authored andcommitted
HHH-19529 Check bytecode generated classes with stable names class loaders to ensure EE subdeployment contained entity classes are used in preference to top level deployment (e.g. EAR/lib)
Signed-off-by: Scott Marlow <[email protected]>
1 parent 8ac3d19 commit 4f9e5c1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,10 @@ void clearState() {
229229
*/
230230
public Class<?> load(Class<?> referenceClass, String className, BiFunction<ByteBuddy, NamingStrategy, DynamicType.Builder<?>> makeClassFunction) {
231231
try {
232-
return referenceClass.getClassLoader().loadClass( className );
232+
Class<?> result = referenceClass.getClassLoader().loadClass(className);
233+
if ( result.getClassLoader() == referenceClass.getClassLoader() ) {
234+
return result;
235+
}
233236
}
234237
catch (ClassNotFoundException e) {
235238
// Ignore

0 commit comments

Comments
 (0)