Fixed problem with sending null values from the client to the server

diff --git a/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/src/com/vaadin/terminal/gwt/server/JsonCodec.java
index 750aa7c15b062fa07fdc879cf88d9a2461681e37..ed2bf66cedcbda70da5f7ef318e1f3739cbf9d85 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/JsonCodec.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonCodec.java
@@ -143,8 +143,12 @@ public class JsonCodec implements Serializable {
         }
 
         // Try to decode object using fields
-        return decodeObject(targetType, (JSONObject) valueAndType.get(1),
-                application);
+        Object value = valueAndType.get(1);
+        if (value == JSONObject.NULL) {
+            return null;
+        } else {
+            return decodeObject(targetType, (JSONObject) value, application);
+        }
     }
 
     /**