WFLY-8695 WeldPortableExtensionProcessor should clean extension regis…

…try on undeploy()
wildfly · May 6, 2017 · 7fee6de · 7fee6de
1 parent 7398a11
commit 7fee6de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/weld/common/src/main/java/org/jboss/as/weld/deployment/WeldPortableExtensions.java b/weld/common/src/main/java/org/jboss/as/weld/deployment/WeldPortableExtensions.java
@@ -26,7 +26,7 @@
  */
 public class WeldPortableExtensions {
 
-    private static final AttachmentKey<WeldPortableExtensions> ATTACHMENT_KEY = AttachmentKey.create(WeldPortableExtensions.class);
+    public static final AttachmentKey<WeldPortableExtensions> ATTACHMENT_KEY = AttachmentKey.create(WeldPortableExtensions.class);
 
     public static WeldPortableExtensions getPortableExtensions(final DeploymentUnit deploymentUnit) {
         if (deploymentUnit.getParent() == null) {

diff --git a/...src/main/java/org/jboss/as/weld/deployment/processors/WeldPortableExtensionProcessor.java b/...src/main/java/org/jboss/as/weld/deployment/processors/WeldPortableExtensionProcessor.java
@@ -54,8 +54,6 @@
  */
 public class WeldPortableExtensionProcessor implements DeploymentUnitProcessor {
 
-    private static final String[] EMPTY_STRING_ARRAY = {};
-
     @Override
     public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException {
         final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
@@ -138,8 +136,10 @@ private Class<Extension> loadExtension(String serviceClassName, final ClassLoade
     }
 
     @Override
-    public void undeploy(DeploymentUnit context) {
-
+    public void undeploy(DeploymentUnit deploymentUnit) {
+        if (deploymentUnit.getParent() == null) {
+            deploymentUnit.removeAttachment(WeldPortableExtensions.ATTACHMENT_KEY);
+        }
     }
 
 }