From 384e98e10c627921f663b5037ec8c13e46969ca7 Mon Sep 17 00:00:00 2001
From: Anna Koskinen <Ansku@users.noreply.github.com>
Date: Fri, 5 Mar 2021 14:17:20 +0200
Subject: [PATCH] Prevent NPE in comparison (#12218) (#12230)

* 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 c41461f7292..8a11cc36ee8 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 @@ private BindingValidationStatus<TARGET> writeFieldValue(BEAN bean) {
                     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);
                         }
                     }