Return-Path: 
 <tomcat-dev-return-53844-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org
Received: (qmail 52733 invoked from network); 14 Dec 2004 14:04:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 14 Dec 2004 14:04:36 -0000
Received: (qmail 23505 invoked by uid 500); 14 Dec 2004 13:57:59 -0000
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 23403 invoked by uid 500); 14 Dec 2004 13:57:58 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 23345 invoked by uid 500); 14 Dec 2004 13:57:57 -0000
Received: (qmail 23327 invoked by uid 99); 14 Dec 2004 13:57:57 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 14 Dec 2004 05:57:53 -0800
Received: (qmail 47435 invoked by uid 1135); 14 Dec 2004 13:57:31 -0000
Date: 14 Dec 2004 13:57:31 -0000
Message-ID: <20041214135731.47434.qmail@minotaur.apache.org>
From: remm@apache.org
To: jakarta-tomcat-catalina-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

remm        2004/12/14 05:57:31

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
               webapps/docs changelog.xml
  Log:
  - 32694: Fix bad code to make a path absolute, which caused problem if the VM working path is not catalina.base.
  
  Revision  Changes    Path
  1.60      +6 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- ContextConfig.java	2 Oct 2004 09:22:18 -0000	1.59
  +++ ContextConfig.java	14 Dec 2004 13:57:31 -0000	1.60
  @@ -843,7 +843,11 @@
               }
               File docBaseFile = new File(docBase);
               if (!docBaseFile.isAbsolute()) {
  -                docBaseFile = new File(appBase, docBase);
  +                File file = new File(appBase);
  +                if (!file.isAbsolute()) {
  +                    file = new File(System.getProperty("catalina.base"), appBase);
  +                }
  +                docBaseFile = new File(file, docBase);
               }
               
               String path = context.getPath();
  
  
  
  1.205     +11 -0     jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.204
  retrieving revision 1.205
  diff -u -r1.204 -r1.205
  --- changelog.xml	11 Dec 2004 08:06:20 -0000	1.204
  +++ changelog.xml	14 Dec 2004 13:57:31 -0000	1.205
  @@ -26,6 +26,17 @@
     </p>
   </section>
   
  +<section name="Tomcat 5.5.7 (yoavs)">
  +  <subsection name="Catalina">
  +    <changelog>
  +      <fix>
  +        <bug>32694</bug>: Fix bad code to make docBase path aboslute in antiLocking
  +        method. (remm)
  +      </fix>
  +    </changelog>
  +  </subsection>
  +</section>
  +
   <section name="Tomcat 5.5.6 (yoavs)">
     <subsection name="General">
       <changelog>
  
  
  

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