Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #504 from davoustp/master

Browse Source 
Cache all OGNL expressions (when enabled) irrespective of their execution status [Fixes WW-5147]
Close #503
This commit is contained in:
Lukasz Lenart
2021-11-16 09:37:52 +01:00
committed by GitHub
parent 584095d69e c8dfb3f4df
commit 0dc83eef5b
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+4 -12
View File
@@ -536,18 +536,14 @@ public class OgnlUtil {
if (tree == null) {
tree = Ognl.parseExpression(expression);
checkEnableEvalExpression(tree, context);
expressions.putIfAbsent(expression, tree);
}
} else {
tree = Ognl.parseExpression(expression);
checkEnableEvalExpression(tree, context);
}
final T exec = task.execute(tree);
// if cache is enabled and it's a valid expression, puts it in
if (enableExpressionCache) {
expressions.putIfAbsent(expression, tree);
}
return exec;
return task.execute(tree);
}
private <T> Object compileAndExecuteMethod(String expression, Map<String, Object> context, OgnlTask<T> task) throws OgnlException {
@@ -557,18 +553,14 @@ public class OgnlUtil {
if (tree == null) {
tree = Ognl.parseExpression(expression);
checkSimpleMethod(tree, context);
expressions.putIfAbsent(expression, tree);
}
} else {
tree = Ognl.parseExpression(expression);
checkSimpleMethod(tree, context);
}
final T exec = task.execute(tree);
// if cache is enabled and it's a valid expression, puts it in
if (enableExpressionCache) {
expressions.putIfAbsent(expression, tree);
}
return exec;
return task.execute(tree);
}
public Object compile(String expression, Map<String, Object> context) throws OgnlException {
core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+40
View File
@@ -128,6 +128,46 @@ public class OgnlUtilTest extends XWorkTestCase {
assertSame(expr0, expr2);
}
public void testExpressionIsCachedIrrespectiveOfItsExecutionStatus() throws OgnlException {
Foo foo = new Foo();
OgnlContext context = (OgnlContext) ognlUtil.createDefaultContext(foo);
// Expression which executes with success
try {
ognlUtil.getValue("@com.opensymphony.xwork2.ognl.OgnlUtilTest@STATIC_FINAL_PUBLIC_ATTRIBUTE", context, foo);
assertEquals("Successfully executed expression must have been cached", ognlUtil.expressionCacheSize(), 1);
} catch (Exception ex) {
fail("Expression execution should have succeeded here. Exception: " + ex);
}
// Expression which executes with failure
try {
ognlUtil.getValue("@com.opensymphony.xwork2.ognl.OgnlUtilTest@STATIC_PRIVATE_ATTRIBUTE", context, foo);
fail("Expression execution should have failed here");
} catch (Exception ex) {
assertEquals("Expression with failed execution must have been cached nevertheless", ognlUtil.expressionCacheSize(), 2);
}
}
public void testMethodExpressionIsCachedIrrespectiveOfItsExecutionStatus() throws Exception {
Foo foo = new Foo();
OgnlContext context = (OgnlContext) ognlUtil.createDefaultContext(foo);
// Method expression which executes with success
try {
ognlUtil.callMethod("getBar()", context, foo);
assertTrue("Successfully executed method expression must have been cached", ognlUtil.expressionCacheSize() == 1);
} catch (Exception ex) {
fail("Method expression execution should have succeeded here. Exception: " + ex);
}
// Method expression which executes with failure
try {
ognlUtil.callMethod("getNonExistingMethod()", context, foo);
fail("Expression execution should have failed here");
} catch (Exception ex) {
assertEquals("Method expression with failed execution must have been cached nevertheless", ognlUtil.expressionCacheSize(), 2);
}
}
public void testClearExpressionCache() throws OgnlException {
ognlUtil.setEnableExpressionCache("true");
// Test that the expression cache is functioning as expected.