From bafab4554a43f7c0214e919fa9d594a92305bc92 Mon Sep 17 00:00:00 2001
From: vt512 <vt512@users.noreply.github.com>
Date: Tue, 8 Sep 2020 16:29:17 +0200
Subject: fix duplicate key exception with Binder when interface method is
 overwritten (#12091)

---
 server/src/main/java/com/vaadin/data/BeanPropertySet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/src/main/java')

diff --git a/server/src/main/java/com/vaadin/data/BeanPropertySet.java b/server/src/main/java/com/vaadin/data/BeanPropertySet.java
index 90c264eaa1..bd856c23f8 100644
--- a/server/src/main/java/com/vaadin/data/BeanPropertySet.java
+++ b/server/src/main/java/com/vaadin/data/BeanPropertySet.java
@@ -313,7 +313,7 @@ public class BeanPropertySet<T> implements PropertySet<T> {
                     .map(descriptor -> new BeanPropertyDefinition<>(this,
                             instanceKey.type, descriptor))
                     .collect(Collectors.toMap(PropertyDefinition::getName,
-                            Function.identity()));
+                            Function.identity(), (pd1, pd2) -> pd2));
         } catch (IntrospectionException e) {
             throw new IllegalArgumentException(
                     "Cannot find property descriptors for "
-- 
cgit v1.2.3