Author: markt
Date: Wed Apr 27 11:34:42 2016
New Revision: 1741233
URL: http://svn.apache.org/viewvc?rev=1741233&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Declare field using interface rather than implementation.
Also:
- Use final
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManagerBindings.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 11:34:42 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,1741225
+/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,1741232
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManagerBindings.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManagerBindings.java?rev=1741233&r1=1741232&r2=1741233&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManagerBindings.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManagerBindings.java
Wed Apr 27 11:34:42 2016
@@ -16,12 +16,12 @@
*/
package org.apache.tomcat;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public final class InstanceManagerBindings {
- private static final ConcurrentHashMap<ClassLoader, InstanceManager>
bindings =
- new ConcurrentHashMap<>();
+ private static final Map<ClassLoader, InstanceManager> bindings = new
ConcurrentHashMap<>();
public static final void bind(ClassLoader classLoader, InstanceManager
instanceManager) {
bindings.put(classLoader, instanceManager);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1741233&r1=1741232&r2=1741233&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSLContext.java Wed Apr 27
11:34:42 2016
@@ -415,7 +415,7 @@ public final class SSLContext {
* since a Tomcat instance may have several TLS enabled endpoints that each
* have different SSL Context mappings for the same host name.
*/
- private static Map<Long,SNICallBack> sniCallBacks = new
ConcurrentHashMap<>();
+ private static final Map<Long,SNICallBack> sniCallBacks = new
ConcurrentHashMap<>();
/**
* Register an OpenSSL SSLContext that will be used to initiate TLS
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java?rev=1741233&r1=1741232&r2=1741233&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
Wed Apr 27 11:34:42 2016
@@ -21,6 +21,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
+import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.ConcurrentHashMap;
@@ -75,15 +76,13 @@ public final class FastHttpDateFormat {
/**
* Formatter cache.
*/
- private static final ConcurrentHashMap<Long, String> formatCache =
- new ConcurrentHashMap<>(CACHE_SIZE);
+ private static final Map<Long, String> formatCache = new
ConcurrentHashMap<>(CACHE_SIZE);
/**
* Parser cache.
*/
- private static final ConcurrentHashMap<String, Long> parseCache =
- new ConcurrentHashMap<>(CACHE_SIZE);
+ private static final Map<String, Long> parseCache = new
ConcurrentHashMap<>(CACHE_SIZE);
// --------------------------------------------------------- Public Methods
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1741233&r1=1741232&r2=1741233&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Wed Apr 27 11:34:42 2016
@@ -26,6 +26,7 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
@@ -83,12 +84,12 @@ public class WsServerContainer extends W
private final ServletContext servletContext;
private final Map<String,ServerEndpointConfig> configExactMatchMap =
new ConcurrentHashMap<>();
- private final ConcurrentHashMap<Integer,SortedSet<TemplatePathMatch>>
- configTemplateMatchMap = new ConcurrentHashMap<>();
+ private final ConcurrentMap<Integer,SortedSet<TemplatePathMatch>>
configTemplateMatchMap =
+ new ConcurrentHashMap<>();
private volatile boolean enforceNoAddAfterHandshake =
org.apache.tomcat.websocket.Constants.STRICT_SPEC_COMPLIANCE;
private volatile boolean addAllowed = true;
- private final ConcurrentHashMap<String,Set<WsSession>>
authenticatedSessions =
+ private final ConcurrentMap<String,Set<WsSession>> authenticatedSessions =
new ConcurrentHashMap<>();
private final ExecutorService executorService;
private final ThreadGroup threadGroup;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
