billbarker    2003/03/15 17:57:57

  Modified:    coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
  Log:
  Port patch.
  
  Revision  Changes    Path
  1.17      +16 -11    
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CoyoteAdapter.java        15 Mar 2003 11:37:05 -0000      1.16
  +++ CoyoteAdapter.java        16 Mar 2003 01:57:57 -0000      1.17
  @@ -370,14 +370,19 @@
                               .getRequestedSessionId());
                   }
               }
  -         try {
  -             Cookie cookie = new Cookie(scookie.getName().toString(),
  +            try {
  +                Cookie cookie = new Cookie(scookie.getName().toString(),
                                          scookie.getValue().toString());
  -             cookies[idx++] = cookie;
  -         } catch (Exception ex) {
  -             log("Bad Cookie Name: " + scookie.getName() + 
  -                 " /Value: " + scookie.getValue(),ex);
  -         }
  +                cookies[idx++] = cookie;
  +            } catch (Exception ex) {
  +                log("Bad Cookie Name: " + scookie.getName() + 
  +                    " /Value: " + scookie.getValue(),ex);
  +            }
  +        }
  +        if( idx < count ) {
  +            Cookie [] ncookies = new Cookie[idx];
  +            System.arraycopy(cookies, 0, ncookies, 0, idx);
  +            cookies = ncookies;
           }
   
           request.setCookies(cookies);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to