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, 17 Nov 2004 15:00:48 GMT
yoavs       2004/11/17 07:00:48

  Modified:    catalina/src/share/org/apache/catalina/session
                        FileStore.java
               webapps/docs changelog.xml
  Log:
  Bugzilla 32130: add safety check to FileStore#keys method.
  
  Revision  Changes    Path
  1.6       +7 -1      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/FileStore.java
  
  Index: FileStore.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/FileStore.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FileStore.java	23 Jun 2004 13:51:36 -0000	1.5
  +++ FileStore.java	17 Nov 2004 15:00:48 -0000	1.6
  @@ -209,7 +209,13 @@
           if (file == null) {
               return (new String[0]);
           }
  +
           String files[] = file.list();
  +        
  +        // Bugzilla 32130
  +        if((files == null) || (files.length < 1)) {
  +            return (new String[0]);
  +        }
   
           // Build and return the list of session identifiers
           ArrayList list = new ArrayList();
  
  
  
  1.165     +19 -4     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.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- changelog.xml	17 Nov 2004 14:35:30 -0000	1.164
  +++ changelog.xml	17 Nov 2004 15:00:48 -0000	1.165
  @@ -26,6 +26,24 @@
     </p>
   </section>
   
  +<section name="Tomcat 5.5.5 (yoavs)">
  +  <subsection name="General">
  +    <changelog>
  +      <update>
  +        <bug>32235</bug>: Sync conf/web.xml MIME types with Apache httpd. (yoavs)
  +      </update>
  +    </changelog>
  +  </subsection>
  +
  +  <subsection name="Catalina">
  +    <changelog>
  +      <fix>
  +        <bug>32130</bug>: Add safety check to FileStore#keys method. (yoavs)
  +      </fix>
  +    </changelog>
  +  </subsection>
  +</section>
  +
   <section name="Tomcat 5.5.4 (yoavs)">
     <subsection name="General">
       <changelog>
  @@ -35,16 +53,13 @@
         <update>
           <bug>31912</bug>: Add PNG and CSS file types to replication filter
default. (yoavs)
         </update>
  -      <update>
  -        <bug>32235</bug>: Sync conf/web.xml MIME types with Apache httpd. (yoavs)
  -      </update>
       </changelog>
     </subsection>
     
     <subsection name="Catalina">
       <changelog>
         <fix>
  -        . Add processExpiresFrequency to PersistentManagerBase and made some small JDBCStore
optimizations (pero)
  +        Add processExpiresFrequency to PersistentManagerBase and made some small JDBCStore
optimizations (pero)
         </fix>
         <fix>
           Register JSP monitoring mbean for each servlet that declares a jsp-file in web.xml.
(luehe)
  
  
  

---------------------------------------------------------------------
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