Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4186 Removes static and uses instance value to set enableExpressionCache constant

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519588 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-09-03 07:37:04 +00:00
parent f046343833
commit f14b4cb418
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
+1
View File
@@ -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);
}
xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
+1
View File
@@ -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);
}
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+7 -9
View File
@@ -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);
}
}
}
xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+2 -2
View File
@@ -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);