From ff41bba3d7d0d8c02570b8dfccb413295e091708 Mon Sep 17 00:00:00 2001
From: Tatu Lund <tatu@vaadin.com>
Date: Fri, 5 Mar 2021 14:03:39 +0200
Subject: Prevent NPE in comparison (#12218)

Fixes: https://github.com/vaadin/framework/issues/12207
---
 server/src/main/java/com/vaadin/data/Binder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/com/vaadin/data/Binder.java b/server/src/main/java/com/vaadin/data/Binder.java
index c41461f729..8a11cc36ee 100644
--- a/server/src/main/java/com/vaadin/data/Binder.java
+++ b/server/src/main/java/com/vaadin/data/Binder.java
@@ -1286,7 +1286,7 @@ public class Binder<BEAN> implements Serializable {
                     setter.accept(bean, value);
                     if (value != null) {
                         FIELDVALUE converted = convertToFieldType(value);
-                        if (!field.getValue().equals(converted)) {
+                        if (!Objects.equals(field.getValue(), converted)) {
                             getField().setValue(converted);
                         }
                     }
-- 
cgit v1.2.3