Author: markt
Date: Wed Apr 27 09:14:44 2016
New Revision: 1741173
URL: http://svn.apache.org/viewvc?rev=1741173&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.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1741173&r1=1741172&r2=1741173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Apr
27 09:14:44 2016
@@ -82,8 +82,7 @@ import org.apache.tomcat.util.res.String
* @author Craig R. McClanahan
* @author Remy Maucherat
*/
-public class ApplicationContext
- implements ServletContext {
+public class ApplicationContext implements ServletContext {
protected static final boolean STRICT_SERVLET_COMPLIANCE;
@@ -134,8 +133,7 @@ public class ApplicationContext
/**
* List of read only attributes for this context.
*/
- private final Map<String,String> readOnlyAttributes =
- new ConcurrentHashMap<>();
+ private final Map<String,String> readOnlyAttributes = new
ConcurrentHashMap<>();
/**
@@ -171,8 +169,7 @@ public class ApplicationContext
/**
* The merged context initialization parameters for this Context.
*/
- private final ConcurrentHashMap<String,String> parameters =
- new ConcurrentHashMap<>();
+ private final Map<String,String> parameters = new ConcurrentHashMap<>();
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1741173&r1=1741172&r2=1741173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Apr 27
09:14:44 2016
@@ -449,7 +449,7 @@ public class StandardContext extends Con
* The context initialization parameters for this web application,
* keyed by name.
*/
- private final ConcurrentHashMap<String, String> parameters = new
ConcurrentHashMap<>();
+ private final Map<String, String> parameters = new ConcurrentHashMap<>();
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
