Author: rjung
Date: Mon Jan 31 20:52:25 2011
New Revision: 1065777
URL: http://svn.apache.org/viewvc?rev=1065777&view=rev
Log:
Be consistent with locks on sessionCreationTiming, sessionExpirationTiming
in DeltaManager.resetStatistics(): use the same lock as elsewhere.
Backport of r1062398 from trunk, resp. r1064254 from TC6.
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=1065777&r1=1065776&r2=1065777&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Mon Jan 31 20:52:25 2011
@@ -31,6 +31,10 @@
<body>
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
+ <fix>
+ Be consistent with locks on sessionCreationTiming,
+ sessionExpirationTiming in DeltaManager.resetStatistics(). (rjung)
+ </fix>
<add>
Provide session creation and destruction rate metrics in the session
managers. (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=1065777&r1=1065776&r2=1065777&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
Mon Jan 31 20:52:25 2011
@@ -1392,15 +1392,19 @@ public class DeltaManager extends Cluste
processingTime = 0 ;
expiredSessions = 0 ;
if (hasSessionCreateStatistics) {
- sessionCreationTiming.clear();
- while (sessionCreationTiming.size() <
- ManagerBase.TIMING_STATS_CACHE_SIZE) {
- sessionCreationTiming.add(null);
+ synchronized (sessionCreationTiming) {
+ sessionCreationTiming.clear();
+ while (sessionCreationTiming.size() <
+ ManagerBase.TIMING_STATS_CACHE_SIZE) {
+ sessionCreationTiming.add(null);
+ }
}
- sessionExpirationTiming.clear();
- while (sessionExpirationTiming.size() <
- ManagerBase.TIMING_STATS_CACHE_SIZE) {
- sessionExpirationTiming.add(null);
+ synchronized (sessionExpirationTiming) {
+ sessionExpirationTiming.clear();
+ while (sessionExpirationTiming.size() <
+ ManagerBase.TIMING_STATS_CACHE_SIZE) {
+ sessionExpirationTiming.add(null);
+ }
}
}
rejectedSessions = 0 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
