diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-08-21 13:12:17 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-08-21 13:12:17 +0300 |
| commit | 7bfa8f43d14d1823b27cfd84f925e23853fbf4c7 (patch) | |
| tree | 546e996a55af8e1ad0734914b6d3f6c6133540c7 | |
| parent | c87c0861ce82e6aab6534aba0e30075ca3588635 (diff) | |
| download | vaadin-framework-7bfa8f43d14d1823b27cfd84f925e23853fbf4c7.tar.gz vaadin-framework-7bfa8f43d14d1823b27cfd84f925e23853fbf4c7.zip | |
Don't pass JSONObject.Null as diffstate value (#9026)
| -rw-r--r-- | server/src/com/vaadin/terminal/gwt/server/JsonCodec.java | 3 |
1 files changed, 3 insertions, 0 deletions
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) { |