svn commit: r1741232 - in /tomcat/trunk/java/org/apache/tomcat: InstanceManagerBindings.java jni/SSLContext.java util/http/FastHttpDateFormat.java websocket/server/WsServerContainer.java

[markt]

Author: markt
Date: Wed Apr 27 11:33:20 2016
New Revision: 1741232

URL: http://svn.apache.org/viewvc?rev=1741232&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Declare field using interface rather than implementation.
Also:
- Use final

Modified:
    tomcat/trunk/java/org/apache/tomcat/InstanceManagerBindings.java
    tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
    tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
    tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/InstanceManagerBindings.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/InstanceManagerBindings.java?rev=1741232&r1=1741231&r2=1741232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/InstanceManagerBindings.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/InstanceManagerBindings.java Wed Apr 27 
11:33:20 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/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1741232&r1=1741231&r2=1741232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Wed Apr 27 11:33:20 
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/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java?rev=1741232&r1=1741231&r2=1741232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Wed 
Apr 27 11:33:20 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/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1741232&r1=1741231&r2=1741232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java 
Wed Apr 27 11:33:20 2016
@@ -83,13 +83,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 Map<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 =
-            new ConcurrentHashMap<>();
+    private final Map<String,Set<WsSession>> authenticatedSessions = new 
ConcurrentHashMap<>();
     private final ExecutorService executorService;
     private final ThreadGroup threadGroup;
     private volatile boolean endpointsRegistered = false;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org