Merge pull request wildfly#18063 from bstansberry/WFLY-19523

[WFLY-19523] Always clear the deployment CL from WildFlyConfiguration…
ropalka · Jul 18, 2024 · 900651d · 900651d
2 parents 6c4a221 + 703398b
commit 900651d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsIntegrationProcessor.java b/jaxrs/src/main/java/org/jboss/as/jaxrs/deployment/JaxrsIntegrationProcessor.java
@@ -393,19 +393,21 @@ public void undeploy(DeploymentUnit context) {
         //see https://issues.jboss.org/browse/WFLY-7037
         //see https://github.com/FasterXML/jackson-databind/issues/1363
         //we use reflection to avoid a non optional dependency on jackson
+        Module module = null;
         try {
-            Module module = context.getAttachment(Attachments.MODULE);
+            module = context.getAttachment(Attachments.MODULE);
             Class<?> typeFactoryClass = module.getClassLoader().loadClass("com.fasterxml.jackson.databind.type.TypeFactory");
             Method defaultInstanceMethod = typeFactoryClass.getMethod("defaultInstance");
             Object typeFactory = defaultInstanceMethod.invoke(null);
             Method clearCache = typeFactoryClass.getDeclaredMethod("clearCache");
             clearCache.invoke(typeFactory);
+        } catch (Exception e) {
+            JAXRS_LOGGER.debugf("Failed to clear class utils LRU map");
+        } finally {
             // Remove the deployment from the registered configuration factory
-            if (JaxrsDeploymentMarker.isJaxrsDeployment(context)) {
+            if (module != null && JaxrsDeploymentMarker.isJaxrsDeployment(context)) {
                 WildFlyConfigurationFactory.getInstance().unregister(module.getClassLoader());
             }
-        } catch (Exception e) {
-            JAXRS_LOGGER.debugf("Failed to clear class utils LRU map");
         }
     }