Anonymous avatar Anonymous committed 582c579

Fixing OgnlUtil cache bug via Java 5 class
XW-740

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/xwork_1-0-3@2083 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (5)

+*~
+build
+This branch of XWork is used by Atlassian Confluence, which depend on an old
+version of WebWork.  It contains only major bug fixes and depends on Java 5.
 name=xwork
-version=1.0.3.1
+version=1.0.3.2
 
     <target name="java">
         <mkdir dir="${build.java}"/>
-        <javac srcdir="${src.java}" destdir="${build.java}" classpathref="cp" debug="on"/>
+        <javac srcdir="${src.java}" destdir="${build.java}" classpathref="cp" debug="on"
+               target="1.5" source="1.5"/>
         <copy filtering="no" todir="${build.java}">
             <fileset dir="${src.java}">
                 <exclude name="**/*.java"/>

src/java/com/opensymphony/xwork/util/OgnlUtil.java

 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
     //~ Static fields/initializers /////////////////////////////////////////////
 
     private static final Log log = LogFactory.getLog(OgnlUtil.class);
-    private static HashMap expressions = new HashMap();
+    private static Map expressions = new ConcurrentHashMap();
 
     //~ Methods ////////////////////////////////////////////////////////////////
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.