mirror of
https://github.com/apache/struts.git
synced 2026-08-11 01:27:14 +00:00
WW-4064 Reverts changes introduced by WW-3698 to avoid class cast exception
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1532741 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
+2
-2
@@ -101,10 +101,10 @@ public class ValueStackDataSource implements JRRewindableDataSource {
|
||||
Object value = valueStack.findValue(expression);
|
||||
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("field: " + field.getName() + "/" + value);
|
||||
LOG.debug("Field [#0] = [#1]", field.getName(), value);
|
||||
}
|
||||
|
||||
if ((!field.getValueClass().isInstance(value) && MakeIterator.isIterable(value))) {
|
||||
if (MakeIterator.isIterable(value)) {
|
||||
// wrap value with ValueStackDataSource if not already wrapped
|
||||
return new ValueStackDataSource(this.valueStack, expression);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user