From 020d93ab94e4bd85e61198e288672aed6b76c028 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Wed, 16 Oct 2013 12:05:23 +0000 Subject: [PATCH] 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 --- .../struts2/views/jasperreports/ValueStackDataSource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java index 88645cb16..57986b634 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java @@ -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 {