davenewton  committed 582c579

Fixing OgnlUtil cache bug via Java 5 class


  • Participants
  • Parent commits 42f4318
  • Branches CONF-27294, xwork_1-0-3 1
    1. xwork_1-0-3_branch

Comments (0)

Files changed (5)

+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.


     <target name="java">
         <mkdir dir="${}"/>
-        <javac srcdir="${}" destdir="${}" classpathref="cp" debug="on"/>
+        <javac srcdir="${}" destdir="${}" classpathref="cp" debug="on"
+               target="1.5" source="1.5"/>
         <copy filtering="no" todir="${}">
             <fileset dir="${}">
                 <exclude name="**/*.java"/>

File src/java/com/opensymphony/xwork/util/

 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 ////////////////////////////////////////////////////////////////