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

[remm]

remm        01/03/27 21:15:15

  Modified:    catalina/src/share/org/apache/catalina/connector
                        HttpResponseBase.java
  Log:
  - Fix for bug 1081.
  
  Revision  Changes    Path
  1.29      +6 -8      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
  
  Index: HttpResponseBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- HttpResponseBase.java     2001/03/14 02:17:21     1.28
  +++ HttpResponseBase.java     2001/03/28 05:15:14     1.29
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
 1.28 2001/03/14 02:17:21 craigmcc Exp $
  - * $Revision: 1.28 $
  - * $Date: 2001/03/14 02:17:21 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
 1.29 2001/03/28 05:15:14 remm Exp $
  + * $Revision: 1.29 $
  + * $Date: 2001/03/28 05:15:14 $
    *
    * ====================================================================
    *
  @@ -99,7 +99,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.28 $ $Date: 2001/03/14 02:17:21 $
  + * @version $Revision: 1.29 $ $Date: 2001/03/28 05:15:14 $
    */
   
   public class HttpResponseBase
  @@ -578,8 +578,8 @@
        HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
        HttpSession session = hreq.getSession(false);
   
  -     if ((session != null) && session.isNew() &&
  -         getContext().getCookies()) {
  +     if ((session != null) && session.isNew() && (getContext() != null) 
  +            && getContext().getCookies()) {
            Cookie cookie = new Cookie(Globals.SESSION_COOKIE_NAME,
                                       session.getId());
            cookie.setMaxAge(-1);
  @@ -1044,8 +1044,6 @@
        String absolute = toAbsolute(location);
        setStatus(SC_MOVED_TEMPORARILY);
        setHeader("Location", absolute);
  -        //setContentLength(0);
  -     //flushBuffer();
   
       }