svn commit: r1439171 - /struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java

[lukaszlenart]

Author: lukaszlenart
Date: Sun Jan 27 20:27:04 2013
New Revision: 1439171

URL: http://svn.apache.org/viewvc?rev=1439171&view=rev
Log:
WW-3698 wraps value with ValueStackDataSource if no already wrapped

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=1439171&r1=1439170&r2=1439171&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
 Sun Jan 27 20:27:04 2013
@@ -104,8 +104,8 @@ public class ValueStackDataSource implem
             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;