From 0f881d7cf2a15d2a895f2727c9b40a09bcd645f4 Mon Sep 17 00:00:00 2001 From: barreiro Date: Fri, 22 Jul 2016 03:23:24 +0100 Subject: [PATCH] HHH-10977 - Fix enhanced classloader so that the testsuite behaves as the enhancement plugins do (cherry picked from commit b3aaa12b64ccb68b3b3f4c55d1ce2a894165670b) Conflicts: hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTestUtils.java --- .../test/bytecode/enhancement/EnhancerTestUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTestUtils.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTestUtils.java index d9a7890123..474b0530ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTestUtils.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTestUtils.java @@ -126,6 +126,9 @@ public abstract class EnhancerTestUtils extends BaseUnitTestCase { private static ClassLoader getEnhancerClassLoader(final EnhancementContext context, final String packageName) { return new ClassLoader() { + private Enhancer enhancer = new Enhancer( context ); + + @SuppressWarnings("ResultOfMethodCallIgnored") @Override public Class loadClass(String name) throws ClassNotFoundException { if ( !name.startsWith( packageName ) ) { @@ -145,7 +148,7 @@ public abstract class EnhancerTestUtils extends BaseUnitTestCase { byte[] original = new byte[is.available()]; new BufferedInputStream( is ).read( original ); - byte[] enhanced = new Enhancer( context ).enhance( name, original ); + byte[] enhanced = enhancer.enhance( name, original ); File f = new File( workingDir + File.separator + name.replace( ".", File.separator ) + ".class" ); f.getParentFile().mkdirs();