From c9f29779026755c83e7cdbbbaa3bc2f85b79dba4 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sun, 27 Jan 2013 20:27:04 +0000
Subject: [PATCH] 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
---
 .../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 e04829159..88645cb16 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
@@ -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;