Author: markt
Date: Thu Jul 17 13:29:25 2008
New Revision: 677709
URL: http://svn.apache.org/viewvc?rev=677709&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
Only ignore docBase it it really is a subdir of appBase. Patch provided by
juergen.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677709&r1=677708&r2=677709&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 17 13:29:25 2008
@@ -48,13 +48,6 @@
+1: fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
- Only ignore docBase it it really is a subdir of appBase
- Patch provided by juergen
- http://svn.apache.org/viewvc?rev=675650&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42565
Make EL ternary expression without space before colon work
Patch provided by Lucas Galfaso
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=677709&r1=677708&r2=677709&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Thu
Jul 17 13:29:25 2008
@@ -607,7 +607,8 @@
docBase = new File(appBase(), context.getDocBase());
}
// If external docBase, register .xml as redeploy first
- if
(!docBase.getCanonicalPath().startsWith(appBase().getAbsolutePath())) {
+ if (!docBase.getCanonicalPath().startsWith(
+ appBase().getAbsolutePath() + File.separator)) {
isExternal = true;
deployedApp.redeployResources.put
(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=677709&r1=677708&r2=677709&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 17 13:29:25 2008
@@ -35,6 +35,10 @@
<section name="Tomcat 6.0.18 (remm)">
<subsection name="Cataina">
<changelog>
+ <fix>
+ <bug>42678</bug>: Only ignore docBase it it really is a subdir of
+ appBase. Patch provided by juergen. (markt)
+ </fix>
<update>
<bug>45285</bug>: Look for annotations in class hierarchy. (markt)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
