Merge pull request #31579 from zakkak/2023-03-03-cleaner-fix

gsmet · web-flow · commit 9c3141f77e45 · 2023-03-03T16:00:03.000+01:00
Reinitialize sun.security.pkcs11.P11Util at runtime
diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java
@@ -231,6 +231,8 @@ private static void prepareBouncyCastleProvider(CurateOutcomeBuildItem curateOut
             runtimeReInitialized.produce(new RuntimeReinitializedClassBuildItem("org.bouncycastle.jcajce.spec.ECUtil"));
         }
 
+        // Reinitialize class because it embeds a java.lang.ref.Cleaner instance in the image heap
+        runtimeReInitialized.produce(new RuntimeReinitializedClassBuildItem("sun.security.pkcs11.P11Util"));
     }
 
     @BuildStep

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,8 @@ private static void prepareBouncyCastleProvider(CurateOutcomeBuildItem curateOut`
`231`	`231`	`runtimeReInitialized.produce(new RuntimeReinitializedClassBuildItem("org.bouncycastle.jcajce.spec.ECUtil"));`
`232`	`232`	`}`
`233`	`233`
	`234`	`+ // Reinitialize class because it embeds a java.lang.ref.Cleaner instance in the image heap`
	`235`	`+ runtimeReInitialized.produce(new RuntimeReinitializedClassBuildItem("sun.security.pkcs11.P11Util"));`
`234`	`236`	`}`
`235`	`237`
`236`	`238`	`@BuildStep`