Author: rjung
Date: Thu Apr 15 20:14:49 2010
New Revision: 934578
URL: http://svn.apache.org/viewvc?rev=934578&view=rev
Log:
Fix BZ48790: Make maxActive thread safe.
Backport of r932904 from TC 6.0.x
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=934578&r1=934577&r2=934578&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Thu Apr 15 20:14:49 2010
@@ -32,6 +32,11 @@
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
<fix>
+ <bug>48790</bug>: Fix thread safety issue in the count of the maximum
+ number of active session.
+ Port from Tomcat 6.0. (rjung)
+ </fix>
+ <fix>
<bug>48398</bug>: Make objects used as locks final to ensure correct
operation. Patch provided by sebb.
Port from Tomcat 6.0. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=934578&r1=934577&r2=934578&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Thu Apr 15 20:14:49 2010
@@ -1295,7 +1295,7 @@ public class DeltaManager extends Cluste
rejectedSessions = 0 ;
sessionReplaceCounter = 0 ;
counterNoStateTransfered = 0 ;
- maxActive = getActiveSessions() ;
+ setMaxActive(getActiveSessions());
sessionCounter = getActiveSessions() ;
counterReceive_EVT_ALL_SESSION_DATA = 0;
counterReceive_EVT_GET_ALL_SESSIONS = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
