From 7bfa8f43d14d1823b27cfd84f925e23853fbf4c7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Tue, 21 Aug 2012 13:12:17 +0300
Subject: [PATCH] Don't pass JSONObject.Null as diffstate value (#9026)

---
 server/src/com/vaadin/terminal/gwt/server/JsonCodec.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
index 884e01f9a5..cb0a604b89 100644
--- a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
+++ b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
@@ -624,6 +624,9 @@ public class JsonCodec implements Serializable {
                     diffStateValue = diffState.get(fieldName);
                     Object referenceFieldValue = decodeInternalOrCustomType(
                             fieldType, diffStateValue, connectorTracker);
+                    if (JSONObject.NULL.equals(diffStateValue)) {
+                        diffStateValue = null;
+                    }
                     equals = equals(fieldValue, referenceFieldValue);
                 }
                 if (!equals) {
-- 
2.39.5