summaryrefslogtreecommitdiffstats
path: root/server/src/main/java/com/vaadin/data
diff options
context:
space:
mode:
authorAleksi Hietanen <aleksi@vaadin.com>2016-12-09 17:24:01 +0200
committerIlia Motornyi <elmot@vaadin.com>2016-12-09 17:24:01 +0200
commitd0184c4ccdbf8fac8b15898a37a409a718c7eb7f (patch)
tree4e3ed32ea926251297b13677212b788d680ce574 /server/src/main/java/com/vaadin/data
parent8bd92c97083f3a14b226d409c8647d63afa6d6ab (diff)
downloadvaadin-framework-d0184c4ccdbf8fac8b15898a37a409a718c7eb7f.tar.gz
vaadin-framework-d0184c4ccdbf8fac8b15898a37a409a718c7eb7f.zip
Erase type of BeanBinder#bindInstanceFields parameter in equality test 8.0.0.alpha9
Fixes vaadin/framework8-issues#466
Diffstat (limited to 'server/src/main/java/com/vaadin/data')
-rw-r--r--server/src/main/java/com/vaadin/data/BeanBinder.java4
1 files changed, 2 insertions, 2 deletions
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<BEAN> extends Binder<BEAN> {
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<BEAN> extends Binder<BEAN> {
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()));
}
}