Author: markt
Date: Wed Apr 27 08:43:30 2016
New Revision: 1741164
URL: http://svn.apache.org/viewvc?rev=1741164&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Simplify. These fields are only used internally so they can be declared as Map
with Java 8.
Reduce visibility of internal field.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1741164&r1=1741163&r2=1741164&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Wed Apr 27
08:43:30 2016
@@ -22,6 +22,7 @@ import java.nio.charset.Charset;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ReadListener;
@@ -65,7 +66,7 @@ public class InputBuffer extends Reader
/**
* Encoder cache.
*/
- private static final
ConcurrentHashMap<Charset,SynchronizedStack<B2CConverter>> encoders =
+ private static final Map<Charset,SynchronizedStack<B2CConverter>> encoders
=
new ConcurrentHashMap<>();
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1741164&r1=1741163&r2=1741164&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Apr 27
08:43:30 2016
@@ -204,7 +204,7 @@ public class Request implements HttpServ
/**
* The attributes associated with this Request, keyed by attribute name.
*/
- protected final ConcurrentHashMap<String, Object> attributes = new
ConcurrentHashMap<>();
+ private final Map<String, Object> attributes = new ConcurrentHashMap<>();
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
