Merge branch 'master' into grid

Change-Id: I6878b3c64eb5c98174537f4e5864e2ff2cb1863f

1 files changed, 2 insertions, 10 deletions

diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
index 6c242dfd74..a31dafe05c 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
@@ -45,25 +45,17 @@ public class FieldProperty extends Property {
     @Override
     public void writeSetterBody(TreeLogger logger, SourceWriter w,
             String beanVariable, String valueVariable) {
-        // Don't try to unbox Longs in javascript, as it's not supported.
-        // (#13692)
-        boolean shouldUnbox = !"long".equals(field.getType()
-                .getSimpleSourceName());
         w.println("%s.@%s::%s = %s;", beanVariable, getBeanType()
-                .getQualifiedSourceName(), getName(),
-                shouldUnbox ? unboxValue(valueVariable) : valueVariable);
+                .getQualifiedSourceName(), getName(), unboxValue(valueVariable));
     }
 
     @Override
     public void writeGetterBody(TreeLogger logger, SourceWriter w,
             String beanVariable) {
-        // Longs are not unboxed, as it's not supported. (#13692)
-        boolean shouldBox = !"long".equals(field.getType()
-                .getSimpleSourceName());
         String value = String.format("%s.@%s::%s", beanVariable, getBeanType()
                 .getQualifiedSourceName(), getName());
         w.print("return ");
-        w.print(shouldBox ? boxValue(value) : value);
+        w.print(boxValue(value));
         w.println(";");
     }