From c680e97bc0a879041f3c24a5c6acdfa1829a8506 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Tue, 21 Aug 2012 18:45:27 +0300
Subject: [PATCH] Don't use diffstate value if it isn't there (#9026)

---
 server/src/com/vaadin/terminal/gwt/server/JsonCodec.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.39.5