]> source.dussan.org Git - vaadin-framework.git/commitdiff
Don't expect type info for Lists, Sets and Arrays (#8879)
authorLeif Åstrand <leif@vaadin.com>
Fri, 8 Jun 2012 08:49:59 +0000 (11:49 +0300)
committerLeif Åstrand <leif@vaadin.com>
Fri, 8 Jun 2012 08:49:59 +0000 (11:49 +0300)
src/com/vaadin/terminal/gwt/server/JsonCodec.java

index f4892bd905769018f7aca32c53decab34e2ea2e7..aa61c68338f00229727867a623eb07c62c41e642 100644 (file)
@@ -388,10 +388,9 @@ public class JsonCodec implements Serializable {
         List<Object> list = new ArrayList<Object>();
         for (int i = 0; i < jsonArray.length(); ++i) {
             // each entry always has two elements: type and value
-            JSONArray encodedValueAndType = jsonArray.getJSONArray(i);
+            Object encodedValue = jsonArray.get(i);
             Object decodedChild = decodeParametrizedType(targetType,
-                    restrictToInternalTypes, 0, encodedValueAndType,
-                    application);
+                    restrictToInternalTypes, 0, encodedValue, application);
             list.add(decodedChild);
         }
         return list;