Author: remm
Date: Wed Nov 14 23:17:50 2018
New Revision: 1846616
URL: http://svn.apache.org/viewvc?rev=1846616&view=rev
Log:
If using configuration source, do not set the default web.xml values.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1846616&r1=1846615&r2=1846616&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Wed Nov 14
23:17:50 2018
@@ -364,6 +364,7 @@ public class Tomcat {
*/
public void init(ConfigurationSource source) {
ConfigFileLoader.setSource(source);
+ addDefaultWebXmlToWebapp = false;
Catalina catalina = new Catalina();
// Load the Catalina instance with the regular configuration files
// from specified source
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
