You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/04/27 13:11:38 UTC
svn commit: r1741226 - in /tomcat/tc8.5.x/trunk: ./
java/org/apache/jasper/compiler/JspRuntimeContext.java
java/org/apache/jasper/servlet/JspCServletContext.java
Author: markt
Date: Wed Apr 27 11:11:38 2016
New Revision: 1741226
URL: http://svn.apache.org/viewvc?rev=1741226&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Declare field using interface rather than implementation.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 11:11:38 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1741226&r1=1741225&r2=1741226&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Wed Apr 27 11:11:38 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/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1741226&r1=1741225&r2=1741226&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Wed Apr 27 11:11:38 2016
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Set;
import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import javax.servlet.Filter;
import javax.servlet.FilterRegistration;
@@ -79,7 +80,7 @@ public class JspCServletContext implemen
/**
* Servlet context initialization parameters.
*/
- private final ConcurrentHashMap<String,String> myParameters;
+ private final ConcurrentMap<String,String> myParameters = new ConcurrentHashMap<>();
/**
@@ -126,7 +127,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 +249,7 @@ public class JspCServletContext implemen
*/
@Override
public Enumeration<String> getInitParameterNames() {
- return myParameters.keys();
+ return Collections.enumeration(myParameters.keySet());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org