From 6d2ea3d5da206f41722630055d7ff1210c7001ba Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 3 Mar 2021 09:41:41 -0600
Subject: [PATCH] Issue #6021 - Addressing defaults

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../modules/global-webapp-common.d/global-webapp-common.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml b/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml
index 93959f7423b0..7f28fd55ca50 100644
--- a/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml
+++ b/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml
@@ -9,7 +9,7 @@
           <Set name="jettyXml">
             <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
               <Arg><Property name="jetty.base"/></Arg>
-              <Arg><Property name="jetty.deploy.webappCommonConfig"/>/etc/webapp-common.xml</Arg>
+              <Arg><Property name="jetty.deploy.webappCommonConfig" default="etc/webapp-common.xml"/></Arg>
             </Call>
           </Set>
         </New>