tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Date Wed, 30 Mar 2005 17:04:09 GMT
yoavs       2005/03/30 09:04:09

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
               webapps/docs changelog.xml
  Log:
  Bugzilla 34220.
  
  Revision  Changes    Path
  1.36      +5 -4      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Catalina.java	23 Oct 2004 16:54:23 -0000	1.35
  +++ Catalina.java	30 Mar 2005 17:04:08 -0000	1.36
  @@ -443,8 +443,9 @@
           Exception ex = null;
           InputSource inputSource = null;
           InputStream inputStream = null;
  +        File file = null;
           try {
  -            File file = configFile();
  +            file = configFile();
               inputStream = new FileInputStream(file);
               inputSource = new InputSource("file://" + file.getAbsolutePath());
           } catch (Exception e) {
  @@ -462,8 +463,8 @@
               }
           }
   
  -        if (inputStream == null) {
  -            log.warn("Can't load server.xml");
  +        if ((inputStream == null) && (file != null)) {
  +            log.warn("Can't load server.xml from " + file.getAbsolutePath());
               return;
           }
   
  
  
  
  1.276     +4 -1      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.275
  retrieving revision 1.276
  diff -u -r1.275 -r1.276
  --- changelog.xml	30 Mar 2005 16:52:52 -0000	1.275
  +++ changelog.xml	30 Mar 2005 17:04:09 -0000	1.276
  @@ -34,13 +34,16 @@
         </update>
       </changelog>
     </subsection>
  -
     <subsection name="Catalina">
       <changelog>
         <fix>
           <bug>20380</bug>: Access log timestamps now take account of Daylight
Saving
           Time (DST). (markt)
         </fix>
  +      <add>
  +        <bug>34220</bug>: Provide better error message when server.xml can't
be located.
  +          [Modified patch from Ralf Hauser] (yoavs)
  +      </add>
       </changelog>
     </subsection>
     <subsection name="Jasper">
  
  
  

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


Mime
View raw message