WW-3698 wraps value with ValueStackDataSource if no already wrapped

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1439171 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-01-27 20:27:04 +00:00
parent 6493648cc1
commit c9f2977902
@@ -104,8 +104,8 @@ public class ValueStackDataSource implements JRRewindableDataSource {
LOG.debug("field: " + field.getName() + "/" + value);
}
if (MakeIterator.isIterable(value)) {
// return new ValueStackDataSource(this.valueStack, field.getName());
if ((!field.getValueClass().isInstance(value) && MakeIterator.isIterable(value))) {
// wrap value with ValueStackDataSource if not already wrapped
return new ValueStackDataSource(this.valueStack, expression);
} else {
return value;