Fixes #8669 by prefixing field names with "json_" instead of just "json" to avoid...

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
index 18bc5439eccd7eab73635f34e141a2e758468081..d3ed9fe4841b246c147cd1aaa4a6879cf75a622f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
@@ -167,8 +167,8 @@ public class SerializerGenerator extends Generator {
             logger.log(Type.DEBUG, "* Processing field " + fieldName + " in "
                     + beanQualifiedSourceName + " (" + beanType.getName() + ")");
 
-            String jsonFieldName = "json" + fieldName;
-            // JSONArray jsonHeight = (JSONArray) jsonValue.get("height");
+            String jsonFieldName = "json_" + fieldName;
+            // JSONArray json_Height = (JSONArray) jsonValue.get("height");
             sourceWriter.println("JSONArray " + jsonFieldName
                     + " = (JSONArray) jsonValue.get(\"" + fieldName + "\");");