Author: lukaszlenart
Date: Wed Oct 16 12:05:23 2013
New Revision: 1532741
URL: http://svn.apache.org/r1532741
Log:
WW-4064 Reverts changes introduced by WW-3698 to avoid class cast exception
Modified:
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
Modified:
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java?rev=1532741&r1=1532740&r2=1532741&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
(original)
+++
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
Wed Oct 16 12:05:23 2013
@@ -101,10 +101,10 @@ public class ValueStackDataSource implem
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 {
