Author: markt
Date: Wed Apr 27 11:09:15 2016
New Revision: 1741225
URL: http://svn.apache.org/viewvc?rev=1741225&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Declare field using interface rather than implementation.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1741225&r1=1741224&r2=1741225&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Wed Apr
27 11:09:15 2016
@@ -163,8 +163,7 @@ public final class JspRuntimeContext {
/**
* Maps JSP pages to their JspServletWrapper's
*/
- private final Map<String, JspServletWrapper> jsps =
- new ConcurrentHashMap<>();
+ private final Map<String, JspServletWrapper> jsps = new
ConcurrentHashMap<>();
/**
* Keeps JSP pages ordered by last access.
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1741225&r1=1741224&r2=1741225&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Wed Apr
27 11:09:15 2016
@@ -79,7 +79,7 @@ public class JspCServletContext implemen
/**
* Servlet context initialization parameters.
*/
- private final ConcurrentHashMap<String,String> myParameters;
+ private final Map<String,String> myParameters = new ConcurrentHashMap<>();
/**
@@ -126,7 +126,6 @@ public class JspCServletContext implemen
throws JasperException {
myAttributes = new HashMap<>();
- myParameters = new ConcurrentHashMap<>();
myParameters.put(Constants.XML_BLOCK_EXTERNAL_INIT_PARAM,
String.valueOf(blockExternal));
myLogWriter = aLogWriter;
@@ -249,7 +248,7 @@ public class JspCServletContext implemen
*/
@Override
public Enumeration<String> getInitParameterNames() {
- return myParameters.keys();
+ return Collections.enumeration(myParameters.keySet());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
