tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r675650 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Date Thu, 10 Jul 2008 17:01:24 GMT
Author: markt
Date: Thu Jul 10 10:01:23 2008
New Revision: 675650

URL: http://svn.apache.org/viewvc?rev=675650&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/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=675650&r1=675649&r2=675650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Jul 10 10:01:23 2008
@@ -608,7 +608,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()));



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message