From d0184c4ccdbf8fac8b15898a37a409a718c7eb7f Mon Sep 17 00:00:00 2001 From: Aleksi Hietanen Date: Fri, 9 Dec 2016 17:24:01 +0200 Subject: Erase type of BeanBinder#bindInstanceFields parameter in equality test Fixes vaadin/framework8-issues#466 --- server/src/main/java/com/vaadin/data/BeanBinder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/src/main') diff --git a/server/src/main/java/com/vaadin/data/BeanBinder.java b/server/src/main/java/com/vaadin/data/BeanBinder.java index 22761c2cd7..c04a36186a 100644 --- a/server/src/main/java/com/vaadin/data/BeanBinder.java +++ b/server/src/main/java/com/vaadin/data/BeanBinder.java @@ -464,7 +464,7 @@ public class BeanBinder extends Binder { memberField.getName(), objectWithMemberFields.getClass().getName())); } - if (propertyType.equals(valueType)) { + if (propertyType.equals(GenericTypeReflector.erase(valueType))) { HasValue field; // Get the field from the object try { @@ -485,7 +485,7 @@ public class BeanBinder extends Binder { throw new IllegalStateException(String.format( "Property type '%s' doesn't " + "match the field type '%s'. " - + "Binding should be configured manulaly using converter.", + + "Binding should be configured manually using converter.", propertyType.getName(), valueType.getTypeName())); } } -- cgit v1.2.3