Author: kkolinko
Date: Wed Aug 8 20:14:36 2012
New Revision: 1370934
URL: http://svn.apache.org/viewvc?rev=1370934&view=rev
Log:
Replace Hashtable with a HashMap.
The maps are in static fields and do not change with time, so no
synchronization is needed.
Noted when reviewing r1370569
Modified:
tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
Modified: tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java?rev=1370934&r1=1370933&r2=1370934&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java Wed Aug 8
20:14:36 2012
@@ -17,8 +17,9 @@
package org.apache.catalina.util;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Locale;
+import java.util.Map;
/**
* MIME2Java is a convenience class which handles conversions between MIME
charset names
@@ -472,11 +473,11 @@ import java.util.Locale;
*/
public class MIME2Java {
- private static final Hashtable<String,String> s_enchash;
- private static final Hashtable<String,String> s_revhash;
+ private static final Map<String,String> s_enchash;
+ private static final Map<String,String> s_revhash;
static {
- s_enchash = new Hashtable<>();
+ s_enchash = new HashMap<>();
// <preferred MIME name>, <Java encoding name>
s_enchash.put("UTF-8", "UTF8");
s_enchash.put("US-ASCII", "8859_1"); // ?
@@ -517,10 +518,10 @@ public class MIME2Java {
s_enchash.put("EBCDIC-CP-IS", "CP871");
s_enchash.put("EBCDIC-CP-AR2", "CP918");
- // j:CNS11643 -> EUC-TW?
- // ISO-2022-CN?
ISO-2022-CN-EXT?
+ // j:CNS11643 -> EUC-TW?
+ // ISO-2022-CN? ISO-2022-CN-EXT?
- s_revhash = new Hashtable<>();
+ s_revhash = new HashMap<>();
// <Java encoding name>, <preferred MIME name>
s_revhash.put("UTF8", "UTF-8");
//s_revhash.put("8859_1", "US-ASCII"); // ?
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
