[Jetty-cvslog] CVS update: JettyExperimental/modules/jetty/src/org/mortbay/jetty Request.java SessionManager.java

[Greg W. <gre...@us...>]

  User: gregwilkins
  Date: 05/10/30 03:07:33

  Modified:    modules/jetty/src/org/mortbay/jetty Request.java
                        SessionManager.java
  Log:
  fixed include
  
  Revision  Changes    Path
  1.9       +2 -2      JettyExperimental/modules/jetty/src/org/mortbay/jetty/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /cvsroot/jetty/JettyExperimental/modules/jetty/src/org/mortbay/jetty/Request.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- Request.java	27 Oct 2005 18:17:58 -0000	1.8
  +++ Request.java	30 Oct 2005 11:07:33 -0000	1.9
  @@ -915,7 +915,7 @@
           if (_session == null && create)
           {
               _session=_sessionManager.newHttpSession(this);
  -            Cookie cookie=_sessionManager.getSessionCookie(_session,isSecure());
  +            Cookie cookie=_sessionManager.getSessionCookie(_session,getContextPath(),isSecure());
               if (cookie!=null)
                   _connection.getResponse().addCookie(cookie);
           }
  
  
  
  1.3       +4 -3      JettyExperimental/modules/jetty/src/org/mortbay/jetty/SessionManager.java
  
  Index: SessionManager.java
  ===================================================================
  RCS file: /cvsroot/jetty/JettyExperimental/modules/jetty/src/org/mortbay/jetty/SessionManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- SessionManager.java	26 Oct 2005 10:12:53 -0000	1.2
  +++ SessionManager.java	30 Oct 2005 11:07:33 -0000	1.3
  @@ -123,9 +123,10 @@
       /* ------------------------------------------------------------ */
       /** Get a Cookie for a session.
        * @param session
  +     * @param contextPath TODO
        * @return
        */
  -    public Cookie getSessionCookie(HttpSession session,boolean requestIsSecure);
  +    public Cookie getSessionCookie(HttpSession session,String contextPath, boolean requestIsSecure);
       
       /* ------------------------------------------------------------ */
       /**