WFLY-9477: avoid registering ROOT.war as default web module more than…

… once
wildfly · Apr 1, 2019 · d6974ec2b3fc43684b10ea88478a6e30f4b1b42e · d6974ec
1 parent 5de7c90
commit d6974ec2b3fc43684b10ea88478a6e30f4b1b42e
Unified Split

Showing with 7 additions and 2 deletions.

+4 −1 undertow/src/main/java/org/wildfly/extension/undertow/HostAdd.java

+3 −1 undertow/src/main/java/org/wildfly/extension/undertow/HostDefinition.java
diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/HostAdd.java b/undertow/src/main/java/org/wildfly/extension/undertow/HostAdd.java
@@ -87,7 +87,10 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
         final int defaultResponseCode = HostDefinition.DEFAULT_RESPONSE_CODE.resolveModelAttribute(context, model).asInt();
         final boolean enableConsoleRedirect = !HostDefinition.DISABLE_CONSOLE_REDIRECT.resolveModelAttribute(context, model).asBoolean();
         final boolean queueRequestsOnStart = HostDefinition.QUEUE_REQUESTS_ON_START.resolveModelAttribute(context, model).asBoolean();
-        DefaultDeploymentMappingProvider.instance().addMapping(defaultWebModule, serverName, name);
+
+        if (!defaultWebModule.equals(HostDefinition.DEFAULT_WEB_MODULE_DEFAULT) || DefaultDeploymentMappingProvider.instance().getMapping(HostDefinition.DEFAULT_WEB_MODULE_DEFAULT) == null) {
+            DefaultDeploymentMappingProvider.instance().addMapping(defaultWebModule, serverName, name);
+        }
 
         final ServiceName virtualHostServiceName = HostDefinition.HOST_CAPABILITY.fromBaseCapability(address).getCapabilityServiceName();
 

diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/HostDefinition.java b/undertow/src/main/java/org/wildfly/extension/undertow/HostDefinition.java
@@ -50,6 +50,8 @@
  */
 class HostDefinition extends PersistentResourceDefinition {
 
+    public static final String DEFAULT_WEB_MODULE_DEFAULT = "ROOT.war";
+
     static final RuntimeCapability<Void> HOST_CAPABILITY = RuntimeCapability.Builder.of(Capabilities.CAPABILITY_HOST, true, Host.class)
             .addRequirements(Capabilities.CAPABILITY_UNDERTOW)
             //addDynamicRequirements(Capabilities.CAPABILITY_SERVER) -- has no function so don't use it
@@ -68,7 +70,7 @@
     static final SimpleAttributeDefinition DEFAULT_WEB_MODULE = new SimpleAttributeDefinitionBuilder(Constants.DEFAULT_WEB_MODULE, ModelType.STRING, true)
             .setRestartAllServices()
             .setValidator(new StringLengthValidator(1, true, false))
-            .setDefaultValue(new ModelNode("ROOT.war"))
+            .setDefaultValue(new ModelNode(DEFAULT_WEB_MODULE_DEFAULT))
             .build();
 
     static final SimpleAttributeDefinition DEFAULT_RESPONSE_CODE = new SimpleAttributeDefinitionBuilder(Constants.DEFAULT_RESPONSE_CODE, ModelType.INT, true)