You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2004/03/12 20:45:43 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteRequest.java

remm        2004/03/12 11:45:43

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationHttpRequest.java
               catalina/src/share/org/apache/catalina/session
                        StandardSession.java
               catalina/src/share/org/apache/coyote/tomcat5
                        CoyoteRequest.java
  Log:
  - Initialize accessCount to 0.
  - Call access when creating a session and in crossContext creations as well.
  
  Revision  Changes    Path
  1.21      +2 -3      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
  
  Index: ApplicationHttpRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ApplicationHttpRequest.java	28 Feb 2004 10:56:52 -0000	1.20
  +++ ApplicationHttpRequest.java	12 Mar 2004 19:45:43 -0000	1.21
  @@ -507,9 +507,8 @@
                       localSession.setMaxInactiveInterval
                           (context.getManager().getMaxInactiveInterval());
                       localSession.setId(other.getId());
  -                } else {
  -                    localSession.access();
                   }
  +                localSession.access();
                   session = localSession;
                   return session.getSession();
               }
  
  
  
  1.39      +2 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
  
  Index: StandardSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- StandardSession.java	11 Mar 2004 19:56:52 -0000	1.38
  +++ StandardSession.java	12 Mar 2004 19:45:43 -0000	1.39
  @@ -278,7 +278,7 @@
       /**
        * The access count for this session.
        */
  -    protected transient int accessCount = 1;
  +    protected transient int accessCount = 0;
   
   
       // ----------------------------------------------------- Session Properties
  
  
  
  1.32      +5 -3      jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java
  
  Index: CoyoteRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- CoyoteRequest.java	27 Feb 2004 14:58:53 -0000	1.31
  +++ CoyoteRequest.java	12 Mar 2004 19:45:43 -0000	1.32
  @@ -2246,10 +2246,12 @@
               ((HttpServletResponse) response).addCookie(cookie);
           }
   
  -        if (session != null)
  +        if (session != null) {
  +            session.access();
               return (session.getSession());
  -        else
  +        } else {
               return (null);
  +        }
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org