From f14b4cb4189ed5dc86bd161d04b8e5f9429fecc7 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 3 Sep 2013 07:37:04 +0000
Subject: [PATCH] WW-4186 Removes static and uses instance value to set
 enableExpressionCache constant

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519588 13f79535-47bb-0310-9956-ffa450edef68
---
 .../xwork2/config/impl/DefaultConfiguration.java |  1 +
 .../xwork2/config/impl/MockConfiguration.java    |  1 +
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java   | 16 +++++++---------
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java   |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
index 4aaf13354..5cd510a10 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
@@ -335,6 +335,7 @@ public class DefaultConfiguration implements Configuration {
         builder.constant(XWorkConstants.DEV_MODE, "false");
         builder.constant(XWorkConstants.LOG_MISSING_PROPERTIES, "false");
         builder.constant(XWorkConstants.ENABLE_OGNL_EVAL_EXPRESSION, "false");
+        builder.constant(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE, "true");
         builder.constant(XWorkConstants.RELOAD_XML_CONFIGURATION, "false");
         return builder.create(true);
     }
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
index b8b6a3e80..7238e012d 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
@@ -59,6 +59,7 @@ public class MockConfiguration implements Configuration {
         new XWorkConfigurationProvider().register(builder, props);
         builder.constant(XWorkConstants.DEV_MODE, "false");
         builder.constant(XWorkConstants.RELOAD_XML_CONFIGURATION, "true");
+        builder.constant(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE, "true");
         container = builder.create(true);
     }
 
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 0ccd1e445..8285b7b14 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -52,10 +52,10 @@ public class OgnlUtil {
     private static final Logger LOG = LoggerFactory.getLogger(OgnlUtil.class);
     private ConcurrentMap<String, Object> expressions = new ConcurrentHashMap<String, Object>();
     private final ConcurrentMap<Class, BeanInfo> beanInfoCache = new ConcurrentHashMap<Class, BeanInfo>();
-
     private TypeConverter defaultConverter;
-    static boolean devMode = false;
-    static boolean enableExpressionCache = true;
+
+    private boolean devMode = false;
+    private boolean enableExpressionCache = true;
     private boolean enableEvalExpression;
 
     @Inject
@@ -64,12 +64,12 @@ public class OgnlUtil {
     }
 
     @Inject(XWorkConstants.DEV_MODE)
-    public static void setDevMode(String mode) {
+    public void setDevMode(String mode) {
         devMode = "true".equals(mode);
     }
 
     @Inject(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE)
-    public static void setEnableExpressionCache(String cache) {
+    public void setEnableExpressionCache(String cache) {
        enableExpressionCache = "true".equals(cache);
     }
 
@@ -464,10 +464,8 @@ public class OgnlUtil {
 
             if (throwPropertyExceptions) {
                 throw new ReflectionException(msg, exception);
-            } else {
-                if (devMode) {
-                    LOG.warn(msg, exception);
-                }
+            } else if (devMode) {
+                LOG.warn(msg, exception);
             }
         }
     }
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 362547fd1..8bd5e23f4 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -92,14 +92,14 @@ public class OgnlUtilTest extends XWorkTestCase {
     }
 
     public void testCacheEnabled() throws OgnlException {
-        OgnlUtil.setEnableExpressionCache("true");
+        ognlUtil.setEnableExpressionCache("true");
         Object expr0 = ognlUtil.compile("test");
         Object expr2 = ognlUtil.compile("test");
         assertSame(expr0, expr2);
     }
 
      public void testCacheDisabled() throws OgnlException {
-        OgnlUtil.setEnableExpressionCache("false");
+        ognlUtil.setEnableExpressionCache("false");
         Object expr0 = ognlUtil.compile("test");
         Object expr2 = ognlUtil.compile("test");
         assertNotSame(expr0, expr2);