This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 2923246fd4 Cleanup
2923246fd4 is described below
commit 2923246fd4275252a95f6838400113c0048d778a
Author: remm <[email protected]>
AuthorDate: Mon Sep 11 16:35:26 2023 +0200
Cleanup
Although concurrency is hard to imagine while starting, sync for
consistency.
Found by coverity.
---
java/org/apache/catalina/session/ManagerBase.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index 4f09ff0a9f..514d7603e2 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -599,11 +599,15 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
// Ensure caches for timing stats are the right size by filling with
// nulls.
- while (sessionCreationTiming.size() < TIMING_STATS_CACHE_SIZE) {
- sessionCreationTiming.add(null);
+ synchronized (sessionCreationTiming) {
+ while (sessionCreationTiming.size() < TIMING_STATS_CACHE_SIZE) {
+ sessionCreationTiming.add(null);
+ }
}
- while (sessionExpirationTiming.size() < TIMING_STATS_CACHE_SIZE) {
- sessionExpirationTiming.add(null);
+ synchronized (sessionExpirationTiming) {
+ while (sessionExpirationTiming.size() < TIMING_STATS_CACHE_SIZE) {
+ sessionExpirationTiming.add(null);
+ }
}
/* Create sessionIdGenerator if not explicitly configured */
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
