diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-20 17:13:30 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-20 17:14:27 +0300 |
| commit | 1ba5c8840334b343dd196d239303148d56fb2a72 (patch) | |
| tree | 2ba3fed1f06c3522e65c3919ebfa1089bacca159 /server/src/com/vaadin | |
| parent | 0a5795024d589ce09ebe6fc0179a9665826ca6e1 (diff) | |
| download | vaadin-framework-1ba5c8840334b343dd196d239303148d56fb2a72.tar.gz vaadin-framework-1ba5c8840334b343dd196d239303148d56fb2a72.zip | |
Fixed comparison of null values (#9696)
Diffstat (limited to 'server/src/com/vaadin')
| -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) { |