cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java

[remm]

remm        2005/05/15 09:29:24

  Modified:    catalina/src/share/org/apache/catalina/startup
                        HostConfig.java
  Log:
  - Use canonical path.
  
  Revision  Changes    Path
  1.61      +2 -2      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
  
  Index: HostConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- HostConfig.java   12 May 2005 09:29:54 -0000      1.60
  +++ HostConfig.java   15 May 2005 16:29:24 -0000      1.61
  @@ -581,7 +581,7 @@
                       docBase = new File(appBase(), context.getDocBase());
                   }
                   // If external docBase, register .xml as redeploy first
  -                if 
(!docBase.getAbsolutePath().startsWith(appBase().getAbsolutePath())) {
  +                if 
(!docBase.getCanonicalPath().startsWith(appBase().getAbsolutePath())) {
                       isExternal = true;
                       deployedApp.redeployResources.put
                           (contextXml.getAbsolutePath(), new 
Long(contextXml.lastModified()));
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]