diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-08-21 18:45:27 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-08-21 18:45:27 +0300 |
commit | c680e97bc0a879041f3c24a5c6acdfa1829a8506 (patch) | |
tree | 26c8a6e2616112f076feec20b2c71d2a9df30208 /server | |
parent | b02028c90b9143ad16864ad371b4b9429e20573a (diff) | |
download | vaadin-framework-c680e97bc0a879041f3c24a5c6acdfa1829a8506.tar.gz vaadin-framework-c680e97bc0a879041f3c24a5c6acdfa1829a8506.zip |
Don't use diffstate value if it isn't there (#9026)
Diffstat (limited to 'server')
-rw-r--r-- | server/src/com/vaadin/terminal/gwt/server/JsonCodec.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java index cb0a604b89..892f7ec526 100644 --- a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java +++ b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java @@ -620,7 +620,7 @@ public class JsonCodec implements Serializable { Object fieldValue = getterMethod.invoke(value, (Object[]) null); boolean equals = false; Object diffStateValue = null; - if (diffState != null) { + if (diffState != null && diffState.has(fieldName)) { diffStateValue = diffState.get(fieldName); Object referenceFieldValue = decodeInternalOrCustomType( fieldType, diffStateValue, connectorTracker); |