Author: markt
Date: Sat Nov 4 17:11:11 2006
New Revision: 471309
URL: http://svn.apache.org/viewvc?view=rev&rev=471309
Log:
Improve fix for 37356.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java?view=diff&rev=471309&r1=471308&r2=471309
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardSession.java
Sat Nov 4 17:11:11 2006
@@ -612,8 +612,10 @@
evaluateIfValid();
- synchronized (lock) {
- accessCount++;
+ if (Globals.STRICT_SERVLET_COMPLIANCE) {
+ synchronized (lock) {
+ accessCount++;
+ }
}
}
@@ -625,10 +627,12 @@
public void endAccess() {
isNew = false;
- synchronized (lock) {
- accessCount--;
+
+ if (Globals.STRICT_SERVLET_COMPLIANCE) {
+ synchronized (lock) {
+ accessCount--;
+ }
}
-
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=471309&r1=471308&r2=471309
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Nov 4 17:11:11 2006
@@ -62,7 +62,15 @@
StandardWrapper. (markt)
</fix>
<fix>
- <bug>37356</bug>: Ensure sessions time out correctly. (markt)
+ <bug>37356</bug>: Ensure sessions time out correctly. This has been
+ fixed by removing the accessCount feature by default. This feature
+ prevents the session from timing out whilst requests that last
+ longer than the session time out are being processed. This feature
+ is enabled by setting the Java option
+ <code>-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true</code>
+ The feature is now implemented with synchronization which addresses
+ the thread safety issues associated with the original bug report.
+ (markt)
</fix>
<fix>
<bug>40528</bug>: Add missing message localisations as provided by
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
