Author: markt
Date: Thu Sep 17 19:27:07 2015
New Revision: 1703673
URL: http://svn.apache.org/viewvc?rev=1703673&view=rev
Log:
Fix data race
Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1703673&r1=1703672&r2=1703673&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Thu Sep 17
19:27:07 2015
@@ -56,7 +56,7 @@ public final class Mapper {
/**
* Array containing the virtual hosts definitions.
*/
- protected MappedHost[] hosts = new MappedHost[0];
+ protected volatile MappedHost[] hosts = new MappedHost[0];
/**
@@ -168,7 +168,7 @@ public final class Mapper {
}
}
- private boolean addHostAliasImpl(MappedHost newAlias) {
+ private synchronized boolean addHostAliasImpl(MappedHost newAlias) {
MappedHost[] newHosts = new MappedHost[hosts.length + 1];
if (insertMap(hosts, newHosts, newAlias)) {
hosts = newHosts;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
