On 13 October 2010 15:41, <ma...@apache.org> wrote: > Author: markt > Date: Wed Oct 13 14:41:57 2010 > New Revision: 1022117 > > URL: http://svn.apache.org/viewvc?rev=1022117&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49987 > Thread safety issue with population of servlet context initialisation > parameters. > Back-port wasn't completely clean - please review. > > Modified: > tomcat/tc6.0.x/trunk/ (props changed) > tomcat/tc6.0.x/trunk/STATUS.txt > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java > tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml >
> Modified: > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1022117&r1=1022116&r2=1022117&view=diff > ============================================================================== > --- > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > (original) > +++ > tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java > Wed Oct 13 14:41:57 2010 > @@ -122,7 +122,8 @@ public class ApplicationContext > /** > * The merged context initialization parameters for this Context. > */ > - private Map parameters = null; > + private Map<String,String> parameters = > + new ConcurrentHashMap<String,String>(); This should be final, surely? --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
