Return-Path: 
 <tomcat-dev-return-20884-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 43905 invoked by uid 500); 8 May 2001 03:31:18 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:tomcat-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:tomcat-dev@jakarta.apache.org>
Reply-To: tomcat-dev@jakarta.apache.org
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 43884 invoked by uid 500); 8 May 2001 03:31:18 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Date: 8 May 2001 03:31:18 -0000
Message-ID: <20010508033118.43878.qmail@apache.org>
From: craigmcc@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets
 SnoopAllServlet.java

craigmcc    01/05/07 20:31:18

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        SnoopAllServlet.java
  Log:
  Reflect the fact that getCookies() can return null.
  
  Revision  Changes    Path
  1.3       +6 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SnoopAllServlet.java
  
  Index: SnoopAllServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SnoopAllServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SnoopAllServlet.java	2000/08/22 00:11:37	1.2
  +++ SnoopAllServlet.java	2001/05/08 03:31:18	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SnoopAllServlet.java,v 1.2 2000/08/22 00:11:37 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/08/22 00:11:37 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/SnoopAllServlet.java,v 1.3 2001/05/08 03:31:18 craigmcc Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/05/08 03:31:18 $
    *
    * ====================================================================
    *
  @@ -84,7 +84,7 @@
    * into an HTML page.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2000/08/22 00:11:37 $
  + * @version $Revision: 1.3 $ $Date: 2001/05/08 03:31:18 $
    */
   
   public final class SnoopAllServlet
  @@ -158,6 +158,8 @@
   	writer.println("<li><b>contextPath</b> = " +
   		       request.getContextPath());
   	Cookie cookies[] = request.getCookies();
  +        if (cookies == null)
  +            cookies = new Cookie[0];
   	for (int i = 0; i < cookies.length; i++)
   	    writer.println("<li><b>cookie</b> " + cookies[i].getName() +
   			   " = " + cookies[i].getValue());