Author: kkolinko
Date: Sun Jan 23 12:01:29 2011
New Revision: 1062398
URL: http://svn.apache.org/viewvc?rev=1062398&view=rev
Log:
Be consistent with locks on sessionCreationTiming, sessionExpirationTiming in
DeltaManager.resetStatistics():
use the same lock as elsewhere.
Corrected a pair of typos in changelog as well.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1062398&r1=1062397&r2=1062398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Sun Jan
23 12:01:29 2011
@@ -1120,15 +1120,19 @@ public CatalinaCluster getCluster() {
public synchronized void resetStatistics() {
processingTime = 0 ;
expiredSessions.set(0);
- 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 ;
sessionReplaceCounter = 0 ;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1062398&r1=1062397&r2=1062398&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Jan 23 12:01:29 2011
@@ -46,7 +46,7 @@
<changelog>
<fix>
<bug>18462</bug>: Don't merge <code>stdout</code> and
- <code>stderr</code> internally so users retain the option to treat the
+ <code>stderr</code> internally so users retain the option to treat them
separately. (markt)
</fix>
<add>
@@ -96,7 +96,7 @@
</fix>
</changelog>
</subsection>
- <subsection>
+ <subsection name="Coyote">
<changelog>
<fix>
Prevent possible thread exhaustion if a Comet timeout event takes a
@@ -134,6 +134,10 @@
<bug>50600</bug>: Prevent a
<code>ConcurrentModificationException</code>
when removing a WAR file via the FarmWarDeployer. (markt)
</fix>
+ <fix>
+ Be consistent with locks on sessionCreationTiming,
+ sessionExpirationTiming in DeltaManager.resetStatistics(). (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
