1. opensymphony
  2. xwork


davenewton  committed 582c579

Fixing OgnlUtil cache bug via Java 5 class

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

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

Comments (0)

Files changed (5)

File .gitignore

View file
  • Ignore whitespace


View file
  • Ignore whitespace
+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.

File build.properties

View file
  • Ignore whitespace

File build.xml

View file
  • Ignore whitespace
     <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"/>

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

View file
  • Ignore whitespace
 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 ////////////////////////////////////////////////////////////////