svn commit: r1794721 - in /tomcat/trunk/java/org/apache: coyote/http2/ConnectionSettingsBase.java tomcat/util/net/SSLHostConfig.java

[ebourg]

Author: ebourg
Date: Wed May 10 13:25:26 2017
New Revision: 1794721

URL: http://svn.apache.org/viewvc?rev=1794721&view=rev
Log:
Use an EnumMap instead of a HashMap when the key is an enum

Modified:
    tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java?rev=1794721&r1=1794720&r2=1794721&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java Wed 
May 10 13:25:26 2017
@@ -16,7 +16,7 @@
  */
 package org.apache.coyote.http2;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 
 import org.apache.juli.logging.Log;
@@ -45,8 +45,8 @@ abstract class ConnectionSettingsBase<T
     static final int DEFAULT_MAX_FRAME_SIZE = MIN_MAX_FRAME_SIZE;
     static final long DEFAULT_MAX_HEADER_LIST_SIZE = UNLIMITED;
 
-    Map<Setting,Long> current = new HashMap<>();
-    Map<Setting,Long> pending = new HashMap<>();
+    Map<Setting, Long> current = new EnumMap<>(Setting.class);
+    Map<Setting, Long> pending = new EnumMap<>(Setting.class);
 
 
     ConnectionSettingsBase(String connectionId) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1794721&r1=1794720&r2=1794721&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Wed May 10 
13:25:26 2017
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.security.KeyStore;
 import java.security.UnrecoverableKeyException;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -65,7 +65,7 @@ public class SSLHostConfig implements Se
 
     private Type configType = null;
     private Type currentConfigType = null;
-    private Map<Type,Set<String>> configuredProperties = new HashMap<>();
+    private Map<Type, Set<String>> configuredProperties = new 
EnumMap<>(Type.class);
 
     private String hostName = DEFAULT_SSL_HOST_NAME;
 



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