Author: markt
Date: Wed Sep 2 18:57:28 2015
New Revision: 1700870
URL: http://svn.apache.org/r1700870
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58313
Fix concurrent access of encoders map when clearing encoders prior to switch to
async.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1700870&r1=1700869&r2=1700870&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Wed Sep
2 18:57:28 2015
@@ -21,7 +21,7 @@ import java.io.Writer;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletResponse;
@@ -125,7 +125,7 @@ public class OutputBuffer extends Writer
/**
* List of encoders.
*/
- protected final HashMap<String, C2BConverter> encoders = new HashMap<>();
+ protected final ConcurrentHashMap<String, C2BConverter> encoders = new
ConcurrentHashMap<>();
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
