remm 02/01/04 15:19:00
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardContextValve.java
StandardHostValve.java
Log:
- Port patch.
- Fix for 5368: mark the session as accessed before going in the Context
pipeline (before, the session was marked as non-new only in the last useable
valve of the pipeline).
Revision Changes Path
No revision
No revision
1.12.2.3 +6 -17
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
Index: StandardContextValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- StandardContextValve.java 5 Oct 2001 22:01:44 -0000 1.12.2.2
+++ StandardContextValve.java 4 Jan 2002 23:19:00 -0000 1.12.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
1.12.2.2 2001/10/05 22:01:44 remm Exp $
- * $Revision: 1.12.2.2 $
- * $Date: 2001/10/05 22:01:44 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
1.12.2.3 2002/01/04 23:19:00 remm Exp $
+ * $Revision: 1.12.2.3 $
+ * $Date: 2002/01/04 23:19:00 $
*
* ====================================================================
*
@@ -74,10 +74,9 @@
import org.apache.naming.ContextBindings;
import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.catalina.Container;
-import org.apache.catalina.Manager;
+import org.apache.catalina.Context;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
-import org.apache.catalina.Session;
import org.apache.catalina.ValveContext;
import org.apache.catalina.Wrapper;
import org.apache.catalina.util.RequestUtil;
@@ -93,7 +92,7 @@
* when processing HTTP requests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.12.2.2 $ $Date: 2001/10/05 22:01:44 $
+ * @version $Revision: 1.12.2.3 $ $Date: 2002/01/04 23:19:00 $
*/
final class StandardContextValve
@@ -169,17 +168,7 @@
return;
}
- // Update the session last access time for our session (if any)
- StandardContext context = (StandardContext) getContainer();
- String sessionId = hreq.getRequestedSessionId();
- if (sessionId != null) {
- Manager manager = context.getManager();
- if (manager != null) {
- Session session = manager.findSession(sessionId);
- if ((session != null) && session.isValid())
- session.access();
- }
- }
+ Context context = (Context) getContainer();
// Select the Wrapper to be used for this Request
Wrapper wrapper = null;
1.5.2.1 +21 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
Index: StandardHostValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- StandardHostValve.java 22 Jul 2001 20:25:08 -0000 1.5
+++ StandardHostValve.java 4 Jan 2002 23:19:00 -0000 1.5.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
1.5 2001/07/22 20:25:08 pier Exp $
- * $Revision: 1.5 $
- * $Date: 2001/07/22 20:25:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
1.5.2.1 2002/01/04 23:19:00 remm Exp $
+ * $Revision: 1.5.2.1 $
+ * $Date: 2002/01/04 23:19:00 $
*
* ====================================================================
*
@@ -71,8 +71,10 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Manager;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
+import org.apache.catalina.Session;
import org.apache.catalina.ValveContext;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
@@ -86,7 +88,7 @@
* when processing HTTP requests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/07/22 20:25:08 $
+ * @version $Revision: 1.5.2.1 $ $Date: 2002/01/04 23:19:00 $
*/
final class StandardHostValve
@@ -158,9 +160,23 @@
return;
}
- // Ask this Context to process this request
+ // Bind the context CL to the current thread
Thread.currentThread().setContextClassLoader
(context.getLoader().getClassLoader());
+
+ // Update the session last access time for our session (if any)
+ HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
+ String sessionId = hreq.getRequestedSessionId();
+ if (sessionId != null) {
+ Manager manager = context.getManager();
+ if (manager != null) {
+ Session session = manager.findSession(sessionId);
+ if ((session != null) && session.isValid())
+ session.access();
+ }
+ }
+
+ // Ask this Context to process this request
context.invoke(request, response);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
