[tomcat] branch 8.5.x updated: SpotBugs - backport fix for unlikely concurrency issue

[markt]

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 dbd313b  SpotBugs - backport fix for unlikely concurrency issue
dbd313b is described below

commit dbd313b529dd6efc734194a51eded935aa0583d2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 19 16:39:17 2020 +0100

    SpotBugs - backport fix for unlikely concurrency issue
---
 java/org/apache/catalina/mapper/Mapper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/mapper/Mapper.java 
b/java/org/apache/catalina/mapper/Mapper.java
index 7395a35..30d10a2 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -64,7 +64,7 @@ public final class Mapper {
     /**
      * Default host name.
      */
-    private String defaultHostName = null;
+    private volatile String defaultHostName = null;
     private volatile MappedHost defaultHost = null;
 
 
@@ -691,6 +691,7 @@ public final class Mapper {
                     MappingData mappingData) throws IOException {
 
         if (host.isNull()) {
+            String defaultHostName = this.defaultHostName;
             if (defaultHostName == null) {
                 return;
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org