diff options
| -rw-r--r-- | server/src/com/vaadin/server/JsonCodec.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/JsonCodec.java b/server/src/com/vaadin/server/JsonCodec.java index 72bd1e78f8..55e0fd69ed 100644 --- a/server/src/com/vaadin/server/JsonCodec.java +++ b/server/src/com/vaadin/server/JsonCodec.java @@ -739,6 +739,13 @@ public class JsonCodec implements Serializable { * @return */ private static boolean jsonEquals(Object fieldValue, Object referenceValue) { + if (fieldValue == JSONObject.NULL) { + fieldValue = null; + } + if (referenceValue == JSONObject.NULL) { + referenceValue = null; + } + if (fieldValue == referenceValue) { return true; } else if (fieldValue == null || referenceValue == null) { |