diff --git a/java/org/apache/catalina/connector/InputBuffer.java b/java/org/apache/catalina/connector/InputBuffer.java
index 62b3de5e523a..db798770c62f 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -21,7 +21,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.ReadListener;
 
@@ -104,7 +104,7 @@ public class InputBuffer extends Reader
     /**
      * List of encoders.
      */
-    protected final HashMap<String,B2CConverter> encoders = new HashMap<>();
+    protected final ConcurrentHashMap<String,B2CConverter> encoders = new ConcurrentHashMap<>();
 
 
     /**