--- org/apache/catalina/startup/ContextConfig.java	2021-01-01 00:00:00.000000000 +0000
+++ org/apache/catalina/startup/ContextConfig.java.new	2021-01-01 00:00:00.000000000 +0000
@@ -57,6 +57,7 @@
 import org.apache.catalina.Pipeline;
 import org.apache.catalina.Server;
 import org.apache.catalina.Service;
+import org.apache.catalina.TomcatControllerHandler;
 import org.apache.catalina.Valve;
 import org.apache.catalina.WebResource;
 import org.apache.catalina.WebResourceRoot;
@@ -634,7 +635,7 @@
                     // This will be a NO-OP if the WAR is unchanged.
                     ExpandWar.expand(host, war, pathName);
                 }
-            } else {
+            } else if (!TomcatControllerHandler.getTomcatController().specificFixDocBase(originalDocBase)) {
                 if (war != null) {
                     if (unpackWARs) {
                         docBaseAbsolute = ExpandWar.expand(host, war, pathName);
