Merge pull request wildfly#18293 from michpetrov/wfly-19843

WFLY-19843: deregister capability on removal
rsearls · Oct 13, 2024 · ee5ce21 · ee5ce21
2 parents 38b786d + afea8ba
commit ee5ce21
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/ApplicationSecurityDomainDefinition.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/ApplicationSecurityDomainDefinition.java
@@ -189,6 +189,14 @@ protected void performRemove(OperationContext context, ModelNode operation, Mode
             this.knownApplicationSecurityDomains.removeIf(domain -> domain.isSameDomain(name));
         }
 
+        @Override
+        protected void recordCapabilitiesAndRequirements(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {
+            super.recordCapabilitiesAndRequirements(context, operation, resource);
+            context.deregisterCapability(
+                    RuntimeCapability.buildDynamicCapabilityName(CAPABILITY_APPLICATION_SECURITY_DOMAIN_KNOWN_DEPLOYMENTS, context.getCurrentAddressValue())
+            );
+        }
+
         @Override
         protected ServiceName serviceName(String name) {
             return APPLICATION_SECURITY_DOMAIN_CAPABILITY.getCapabilityServiceName(ApplicationSecurityDomain.class, name);