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 14:54:05 GMT
yoavs       2004/11/17 06:54:05

  Modified:    catalina/src/share/org/apache/catalina/session Tag:
                        TOMCAT_5_0 FileStore.java
               webapps/docs Tag: TOMCAT_5_0 changelog.xml
  Log:
  Bugzilla 32130: added satefy check in FileStore#keys.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.1   +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.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- FileStore.java	27 Feb 2004 14:58:46 -0000	1.4
  +++ FileStore.java	17 Nov 2004 14:54:04 -0000	1.4.2.1
  @@ -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();
  
  
  
  No                   revision
  No                   revision
  1.70.2.68 +3 -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.70.2.67
  retrieving revision 1.70.2.68
  diff -u -r1.70.2.67 -r1.70.2.68
  --- changelog.xml	17 Nov 2004 14:20:00 -0000	1.70.2.67
  +++ changelog.xml	17 Nov 2004 14:54:04 -0000	1.70.2.68
  @@ -52,6 +52,9 @@
         <fix>
           <bug>31851</bug>: UserTransaction in DefaultContext broken. (yoavs)
         </fix>
  +      <fix>
  +        <bug>32130</bug>: Check for null or empty file listing in FileStore#keys.
(yoavs)
  +      </fix>
       </changelog>
     </subsection>
   
  
  
  

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