]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixed NPE when converting "" 90/390/1
authorArtur Signell <artur@vaadin.com>
Mon, 26 Nov 2012 20:42:09 +0000 (22:42 +0200)
committerArtur Signell <artur@vaadin.com>
Mon, 26 Nov 2012 20:42:09 +0000 (22:42 +0200)
Change-Id: I0cdde2ae9a1c40ebe41a2d1f91f972fe803d455f

server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java

index 1c95d4fcebdb6456ea1c979d1a8dd90c51f0a5cd..ef14549182f6b095cca6a5a862bf9934fcba0928 100644 (file)
@@ -75,6 +75,11 @@ public class StringToDoubleConverter implements Converter<String, Double> {
             throw new ConversionException("Could not convert '" + value
                     + "' to " + getModelType().getName());
         }
+        if (parsedValue == null) {
+            // Convert "" to null
+            return null;
+        }
+
         return parsedValue.doubleValue();
     }