gistfile1.txt

$git diff
diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerAdd.java b/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerAdd.java
index b643a6928cf..9a880bb5dd3 100644
--- a/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerAdd.java
+++ b/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerAdd.java
@@ -92,8 +92,7 @@ final class ServletContainerAdd extends AbstractBoottimeAddStepHandler {
         final ModelNode fileCacheTtlNode = ServletContainerDefinition.FILE_CACHE_TIME_TO_LIVE.resolveModelAttribute(context, model);
         final Integer fileCacheTimeToLive = fileCacheTtlNode.isDefined()  ? fileCacheTtlNode.asInt() : null;
         final int defaultCookieVersion = ServletContainerDefinition.DEFAULT_COOKIE_VERSION.resolveModelAttribute(context, model).asInt();
-        final ModelNode preservePathOnForwardNode = ServletContainerDefinition.PRESERVE_PATH_ON_FORWARD.resolveModelAttribute(context, model);
-        final boolean preservePathOnForward = preservePathOnForwardNode.isDefined()? preservePathOnForwardNode.asBoolean():true;
+        final boolean preservePathOnForward = ServletContainerDefinition.PRESERVE_PATH_ON_FORWARD.resolveModelAttribute(context, model).asBoolean();
 
         Boolean directoryListingEnabled = null;
         if(model.hasDefined(Constants.DIRECTORY_LISTING)) {
diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerDefinition.java b/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerDefinition.java
index 07890afb9f5..bd551ff51d0 100644
--- a/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerDefinition.java
+++ b/undertow/src/main/java/org/wildfly/extension/undertow/ServletContainerDefinition.java
@@ -194,6 +194,7 @@ class ServletContainerDefinition extends PersistentResourceDefinition {
             new SimpleAttributeDefinitionBuilder("preserve-path-on-forward", ModelType.BOOLEAN, true)
                     .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
                     .setAllowExpression(true)
+                    .setDefaultValue(ModelNode.FALSE)
                     .build();
 
     private static final List<? extends PersistentResourceDefinition> CHILDREN;
diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/UndertowTransformers.java b/undertow/src/main/java/org/wildfly/extension/undertow/UndertowTransformers.java
index 30ed744ca40..1a26d6f3fd3 100644
--- a/undertow/src/main/java/org/wildfly/extension/undertow/UndertowTransformers.java
+++ b/undertow/src/main/java/org/wildfly/extension/undertow/UndertowTransformers.java
@@ -127,8 +127,8 @@ public class UndertowTransformers implements ExtensionTransformerRegistration {
         subsystemBuilder
                 .addChildResource(UndertowExtension.PATH_SERVLET_CONTAINER)
                 .getAttributeBuilder()
-                     .addRejectCheck(new SimpleRejectAttributeChecker(new ModelNode(true)), PRESERVE_PATH_ON_FORWARD)
-                    .setDiscard(new DiscardAttributeValueChecker(new ModelNode(false)), PRESERVE_PATH_ON_FORWARD)
+                    .setDiscard(new DiscardAttributeValueChecker(new ModelNode(true)), PRESERVE_PATH_ON_FORWARD)
+                    .addRejectCheck(RejectAttributeChecker.DEFINED, PRESERVE_PATH_ON_FORWARD)
                 .end();
     }