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-4427 Converts value retrieved from context

Browse Source
This commit is contained in:
Lukasz Lenart
2014-12-23 16:09:14 +01:00
parent 40822d67f5 3a0350f0dc
commit 60db1aadb0
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+6
View File
@@ -63,6 +63,7 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
Map<Object, Object> overrides;
transient OgnlUtil ognlUtil;
transient SecurityMemberAccess securityMemberAccess;
private transient XWorkConverter converter;
private boolean devMode;
private boolean logMissingProperties;
@@ -351,6 +352,7 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
value = getValue(expr, asType);
if (value == null) {
value = findInContext(expr);
return converter.convertValue(getContext(), value, asType);
}
} finally {
context.remove(THROW_EXCEPTION_ON_FAILURE);
@@ -473,4 +475,8 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
securityMemberAccess.setExcludeProperties(excludeProperties);
}
@Inject
public void setXWorkConverter(final XWorkConverter converter) {
this.converter = converter;
}
}
xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+20
View File
@@ -93,6 +93,26 @@ public class OgnlValueStackTest extends XWorkTestCase {
assertEquals("1, 2", vs.findValue("childAges", String.class));
}
public void testValuesFromContextAreConverted() {
final OgnlValueStack vs = createValueStack();
final String propertyName = "dogName";
final String propertyValue = "Rover";
vs.getContext().put(propertyName, new String[]{propertyValue});
assertEquals(propertyValue, vs.findValue(propertyName, String.class));
}
public void testNullValueFromContextGetsConverted() {
final OgnlValueStack vs = createValueStack();
final String propertyName = "dogName";
final String propertyValue = null;
vs.getContext().put(propertyName, propertyValue);
assertEquals(propertyValue, vs.findValue(propertyName, String.class));
}
public void testFailOnException() {
OgnlValueStack vs = createValueStack();