From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 10 Jul 2008 17:01:23 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6c9da531894a8d6dfd930b61a0176c0b6b915729;p=tomcat7.0

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

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@675650 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index a526de43f..f54debc7a 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -608,7 +608,8 @@ public class HostConfig
                     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()));