cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Request.java

[nacho]

nacho       00/12/01 11:59:35

  Modified:    src/share/org/apache/tomcat/core Request.java
  Log:
  The session was invalidated and reused prior
  to get the request to know about'em.
  
  Revision  Changes    Path
  1.78      +10 -3     jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- Request.java      2000/12/01 06:00:32     1.77
  +++ Request.java      2000/12/01 19:59:34     1.78
  @@ -565,13 +565,20 @@
   
       
       public ServerSession getSession(boolean create) {
  +
  +
        if( serverSession!=null ) {
  -         // if not null, it is validated by the session module
  -         return serverSession;
  +             /// XXX a forwarded request whose session was invalidated
  +            if (!serverSession.getTimeStamp().isValid() && create){
  +                 serverSession.getSessionManager().removeSession( serverSession );
  +                 serverSession=null;
  +            } else
  +                // if not null, it is validated by the session module
  +             return serverSession;
        }
   
        if( ! create ) return null;
  -
  +        
        BaseInterceptor reqI[]= getContainer().
            getInterceptors(Container.H_newSessionRequest);