cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpRequestBase.java

[craigmcc]

craigmcc    01/05/03 12:15:09

  Modified:    catalina/src/share/org/apache/catalina/connector
                        HttpRequestBase.java
  Log:
  HttpServletRequest.getCookies() is supposed to return null if the request
  had no cookies.  We were returning a zero-length array.
  
  PR: BugTRAQ #4453972.
  Submitted by: [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.22      +6 -4      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java
  
  Index: HttpRequestBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- HttpRequestBase.java      2001/04/26 17:41:07     1.21
  +++ HttpRequestBase.java      2001/05/03 19:15:05     1.22
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
 1.21 2001/04/26 17:41:07 craigmcc Exp $
  - * $Revision: 1.21 $
  - * $Date: 2001/04/26 17:41:07 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
 1.22 2001/05/03 19:15:05 craigmcc Exp $
  + * $Revision: 1.22 $
  + * $Date: 2001/05/03 19:15:05 $
    *
    * ====================================================================
    *
  @@ -100,7 +100,7 @@
    * be implemented.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.21 $ $Date: 2001/04/26 17:41:07 $
  + * @version $Revision: 1.22 $ $Date: 2001/05/03 19:15:05 $
    */
   
   public class HttpRequestBase
  @@ -757,6 +757,8 @@
       public Cookie[] getCookies() {
   
        synchronized (cookies) {
  +            if (cookies.size() < 1)
  +                return (null);
            Cookie results[] = new Cookie[cookies.size()];
            return ((Cookie[]) cookies.toArray(results));
        }