This is an automated email from the ASF dual-hosted git repository.
markt 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 a47d35d Fix concurrency issue. Double-check locking needs volatile.
a47d35d is described below
commit a47d35d5dd7285f607a5101c56f126913447ff1d
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Apr 17 12:58:28 2019 +0100
Fix concurrency issue. Double-check locking needs volatile.
---
java/org/apache/tomcat/util/buf/StringCache.java | 4 ++--
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/StringCache.java
b/java/org/apache/tomcat/util/buf/StringCache.java
index cd599aa..84acd19 100644
--- a/java/org/apache/tomcat/util/buf/StringCache.java
+++ b/java/org/apache/tomcat/util/buf/StringCache.java
@@ -79,7 +79,7 @@ public class StringCache {
/**
* Cache for byte chunk.
*/
- protected static ByteEntry[] bcCache = null;
+ protected static volatile ByteEntry[] bcCache = null;
/**
@@ -98,7 +98,7 @@ public class StringCache {
/**
* Cache for char chunk.
*/
- protected static CharEntry[] ccCache = null;
+ protected static volatile CharEntry[] ccCache = null;
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 56917cf..09e4f1c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -51,6 +51,10 @@
Fix a potential resource leak when executing CGI scripts from a WAR
file. Identified by Coverity scan. (markt)
</fix>
+ <fix>
+ Fix a potential concurrency issue in the StringCache identifed by
+ Coverity scan. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
