Clean up ClassTransformingBuildStep's static variable between each te…

…st run
quarkusio · Aug 17, 2023 · c10432b · c10432b
1 parent 708ea79
commit c10432b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java
@@ -40,6 +40,7 @@
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.ArchiveRootBuildItem;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CuratedApplicationShutdownBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.RemovedResourceBuildItem;
@@ -71,13 +72,19 @@ public static byte[] transform(String className, byte[] classData) {
         return lastTransformers.apply(className, classData);
     }
 
+    private static void reset() {
+        lastTransformers = null;
+        transformedClassesCache.clear();
+    }
+
     @BuildStep
     TransformedClassesBuildItem handleClassTransformation(List<BytecodeTransformerBuildItem> bytecodeTransformerBuildItems,
             ApplicationArchivesBuildItem appArchives, LiveReloadBuildItem liveReloadBuildItem,
             LaunchModeBuildItem launchModeBuildItem, ClassLoadingConfig classLoadingConfig,
             CurateOutcomeBuildItem curateOutcomeBuildItem, List<RemovedResourceBuildItem> removedResourceBuildItems,
             ArchiveRootBuildItem archiveRoot, LaunchModeBuildItem launchMode, PackageConfig packageConfig,
-            ExecutorService buildExecutor)
+            ExecutorService buildExecutor,
+            CuratedApplicationShutdownBuildItem shutdown)
             throws ExecutionException, InterruptedException {
         if (bytecodeTransformerBuildItems.isEmpty() && classLoadingConfig.removedResources.isEmpty()
                 && removedResourceBuildItems.isEmpty()) {
@@ -117,6 +124,7 @@ TransformedClassesBuildItem handleClassTransformation(List<BytecodeTransformerBu
         final ConcurrentLinkedDeque<Future<TransformedClassesBuildItem.TransformedClass>> transformed = new ConcurrentLinkedDeque<>();
         final Map<Path, Set<TransformedClassesBuildItem.TransformedClass>> transformedClassesByJar = new HashMap<>();
         ClassLoader transformCl = Thread.currentThread().getContextClassLoader();
+        shutdown.addCloseTask(ClassTransformingBuildStep::reset, true);
         lastTransformers = new BiFunction<String, byte[], byte[]>() {
             @Override
             public byte[] apply(String className, byte[] originalBytes) {