HHH-19230 (6.6) Ensure that thread local for org.hibernate.bytecode.enhance.internal.bytebuddy.SafeCacheProvider + OverridingClassFileLocator are completely cleared

Signed-off-by: Scott Marlow <[email protected]>

Author: scottmarlow

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

@@ -33,4 +33,6 @@ public interface EnhancerClassLocator extends TypePool {
 	 * @return the underlying {@link ClassFileLocator}
 	 */
 	ClassFileLocator asClassFileLocator();
+
+	void reset();
 }

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

@@ -164,6 +164,11 @@ public void discoverTypes(String className, byte[] originalBytes) {
 		}
 	}
 
+	@Override
+	public void clear() {
+		typePool.reset();
+	}
+
 	private DynamicType.Builder<?> doEnhance(Supplier<DynamicType.Builder<?>> builderSupplier, TypeDescription managedCtClass) {
 		// skip if the class was already enhanced. This is very common in WildFly as classloading is highly concurrent.
 		// We need to ensure that no class is instrumented multiple times as that might result in incorrect bytecode.

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

@@ -114,4 +114,10 @@ public ClassFileLocator asClassFileLocator() {
 		return locator;
 	}
 
+	@Override
+	public void reset() {
+		locator.close();
+		poolCache.clear();
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java

@@ -43,4 +43,6 @@ public interface Enhancer {
 	 * @since 6.3
 	 */
 	void discoverTypes(String className, byte[] originalBytes) throws EnhancementException;
+
+	void clear();
 }

hibernate-core/src/main/java/org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl.java

@@ -55,15 +55,16 @@ public byte[] transform(
 			//see https://hibernate.atlassian.net/browse/HHH-18108
 			return null;
 		}
-
+		final Enhancer enhancer = getEnhancer( loader );
 		try {
-			return getEnhancer( loader ).enhance( className, classfileBuffer );
+			return enhancer.enhance( className, classfileBuffer );
 		}
 		catch (final Exception e) {
 			throw new TransformerException( "Error performing enhancement of " + className, e );
 		}
 		finally {
 			bytecodeProvider.resetCaches();
+			enhancer.clear();
 		}
 	}