From 7fee6de34173e652d8fe52d84941d22c891013c1 Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Thu, 4 May 2017 19:36:30 +0200 Subject: [PATCH] WFLY-8695 WeldPortableExtensionProcessor should clean extension registry on undeploy() --- .../jboss/as/weld/deployment/WeldPortableExtensions.java | 2 +- .../processors/WeldPortableExtensionProcessor.java | 8 ++++---- 2 files changed, 5 insertions(+), 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 index a1f0b0a71a6f..ae2c2d2da3b3 100644 --- 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 ATTACHMENT_KEY = AttachmentKey.create(WeldPortableExtensions.class); + public static final AttachmentKey ATTACHMENT_KEY = AttachmentKey.create(WeldPortableExtensions.class); public static WeldPortableExtensions getPortableExtensions(final DeploymentUnit deploymentUnit) { if (deploymentUnit.getParent() == null) { diff --git a/weld/subsystem/src/main/java/org/jboss/as/weld/deployment/processors/WeldPortableExtensionProcessor.java b/weld/subsystem/src/main/java/org/jboss/as/weld/deployment/processors/WeldPortableExtensionProcessor.java index 8f143eaa31f5..44196e00f8a9 100644 --- a/weld/subsystem/src/main/java/org/jboss/as/weld/deployment/processors/WeldPortableExtensionProcessor.java +++ b/weld/subsystem/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 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); + } } }