You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2004/11/23 13:26:45 UTC

cvs commit: incubator-myfaces/src/myfaces/org/apache/myfaces/context/servlet CookieMap.java

manolito    2004/11/23 04:26:45

  Modified:    src/myfaces/org/apache/myfaces/context/servlet
                        CookieMap.java
  Log:
  SF-Bug #1071640 fixed
  
  Revision  Changes    Path
  1.8       +15 -1     incubator-myfaces/src/myfaces/org/apache/myfaces/context/servlet/CookieMap.java
  
  Index: CookieMap.java
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/src/myfaces/org/apache/myfaces/context/servlet/CookieMap.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CookieMap.java	13 Oct 2004 11:51:00 -0000	1.7
  +++ CookieMap.java	23 Nov 2004 12:26:45 -0000	1.8
  @@ -25,9 +25,15 @@
    * 
    * @author Dimitry D'hondt
    * @author Anton Koinov
  + * @version $Revision$ $Date$
  + * $Log$
  + * Revision 1.8  2004/11/23 12:26:45  manolito
  + * SF-Bug #1071640 fixed
  + *
    */
   public class CookieMap extends AbstractAttributeMap
   {
  +    private static final Cookie[] EMPTY_ARRAY = new Cookie[0];
   
       final HttpServletRequest _httpServletRequest;
   
  @@ -45,6 +51,7 @@
       public boolean containsKey(Object key)
       {
           Cookie[] cookies = _httpServletRequest.getCookies();
  +        if (cookies == null) return false;
           for (int i = 0, len = cookies.length; i < len; i++)
           {
               if (cookies[i].getName().equals(key))
  @@ -64,6 +71,7 @@
           }
   
           Cookie[] cookies = _httpServletRequest.getCookies();
  +        if (cookies == null) return false;
           for (int i = 0, len = cookies.length; i < len; i++)
           {
               if (findValue.equals(cookies[i].getValue()))
  @@ -88,6 +96,7 @@
       protected Object getAttribute(String key)
       {
           Cookie[] cookies = _httpServletRequest.getCookies();
  +        if (cookies == null) return null;
           for (int i = 0, len = cookies.length; i < len; i++)
           {
               if (cookies[i].getName().equals(key))
  @@ -113,7 +122,15 @@
   
       protected Enumeration getAttributeNames()
       {
  -        return new CookieNameEnumeration(_httpServletRequest.getCookies());
  +        Cookie[] cookies = _httpServletRequest.getCookies();
  +        if (cookies == null)
  +        {
  +            return new CookieNameEnumeration(EMPTY_ARRAY);
  +        }
  +        else
  +        {
  +            return new CookieNameEnumeration(cookies);
  +        }
       }
       
       private static class CookieNameEnumeration implements Enumeration