Author: markt
Date: Tue Nov 26 00:53:09 2013
New Revision: 1545482
URL: http://svn.apache.org/r1545482
Log:
Fix bug in r1545481 backport
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1545482&r1=1545481&r2=1545482&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Tue
Nov 26 00:53:09 2013
@@ -953,7 +953,7 @@ public class HostConfig
// configuration necessary for a secure deployment.
log.error(sm.getString("hostConfig.deployDescriptor.blocked",
cn.getPath(), Constants.ApplicationContextXml,
- new File(host.getConfigBaseFile(), cn.getBaseName() +
".xml")));
+ new File(configBase(), cn.getBaseName() + ".xml")));
} else {
context = (Context) Class.forName(contextClass).newInstance();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
