Author: markt
Date: Wed Apr 27 08:23:58 2016
New Revision: 1741157
URL: http://svn.apache.org/viewvc?rev=1741157&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Simplify. These fields are only used internally so they can be declared as Map
with Java 8.
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/javax/el/Util.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1741157&r1=1741156&r2=1741157&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Wed Apr 27 08:23:58 2016
@@ -34,7 +34,6 @@ import java.security.PrivilegedAction;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -56,8 +55,7 @@ public abstract class ExpressionFactory
private static final String PROPERTY_FILE;
private static final CacheValue nullTcclFactory = new CacheValue();
- private static final ConcurrentMap<CacheKey, CacheValue> factoryCache =
- new ConcurrentHashMap<>();
+ private static final Map<CacheKey, CacheValue> factoryCache = new
ConcurrentHashMap<>();
static {
if (IS_SECURITY_ENABLED) {
Modified: tomcat/trunk/java/javax/el/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1741157&r1=1741156&r2=1741157&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/Util.java (original)
+++ tomcat/trunk/java/javax/el/Util.java Wed Apr 27 08:23:58 2016
@@ -31,7 +31,6 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -80,8 +79,7 @@ class Util {
private static final CacheValue nullTcclFactory = new CacheValue();
- private static final ConcurrentMap<CacheKey, CacheValue> factoryCache =
- new ConcurrentHashMap<>();
+ private static final Map<CacheKey, CacheValue> factoryCache = new
ConcurrentHashMap<>();
/**
* Provides a per class loader cache of ExpressionFactory instances without
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
