svn commit: r1741221 - /tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java

[markt]

Author: markt
Date: Wed Apr 27 11:00:08 2016
New Revision: 1741221

URL: http://svn.apache.org/viewvc?rev=1741221&view=rev
Log:
Review of Map / ConcurrentMap / ConcurrentHashMap
Declare that functions must be thread-safe
Modified:
    tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java

Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=1741221&r1=1741220&r2=1741221&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Wed Apr 27 
11:00:08 2016
@@ -21,8 +21,8 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.lang.reflect.Method;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import javax.el.FunctionMapper;
 
@@ -37,7 +37,7 @@ public class FunctionMapperImpl extends
 
     private static final long serialVersionUID = 1L;
 
-    protected Map<String, Function> functions = new ConcurrentHashMap<>();
+    protected ConcurrentMap<String, Function> functions = new 
ConcurrentHashMap<>();
 
     /*
      * (non-Javadoc)
@@ -84,7 +84,7 @@ public class FunctionMapperImpl extends
     @Override
     public void readExternal(ObjectInput in) throws IOException,
             ClassNotFoundException {
-        this.functions = (Map<String, Function>) in.readObject();
+        this.functions = (ConcurrentMap<String, Function>) in.readObject();
     }
 
     public static class Function implements Externalizable {



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