Author: markt
Date: Fri Jun 6 10:33:15 2014
New Revision: 1600840
URL: http://svn.apache.org/r1600840
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56578
Correct regression in the fix for 56339 that prevented sessions from expiring
when using clustering.
The effect of removing expiring = true; from the DeltaSession is that if
parallel calls are made to expire() then there is a slightly greater chance of
some of those calls blocking while the first completes. This is because
expiring is now set to true a little later.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
- copied unchanged from r1600839,
tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1600839
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1600840&r1=1600839&r2=1600840&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Fri Jun 6 10:33:15 2014
@@ -459,10 +459,6 @@ public class DeltaSession extends Standa
if (manager == null)
return;
- // Mark this session as "being expired". The flag will be unset in
- // the call to super.expire(notify)
- expiring = true;
-
String expiredId = getIdInternal();
if(notifyCluster && expiredId != null &&
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1600840&r1=1600839&r2=1600840&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 6 10:33:15 2014
@@ -81,6 +81,10 @@
<bug>56588</bug>: Update deprecation of
Context.addApplicationListener()
methods according to changes in Tomcat 8. (kkolinko)
</scode>
+ <fix>
+ <bug>56578</bug>: Correct regression in the fix for <bug>56339</bug>
+ that prevented sessions from expiring when using clustering. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
