From: Artur Signell <artur@vaadin.com>
Date: Mon, 26 Nov 2012 20:42:09 +0000 (+0200)
Subject: Fixed NPE when converting ""
X-Git-Tag: 7.0.0.beta11~139
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07f915d7fc441a8fc0a161d34c9b2567ae42f5c8;p=vaadin-framework.git

Fixed NPE when converting ""

Change-Id: I0cdde2ae9a1c40ebe41a2d1f91f972fe803d455f
---

diff --git a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
index 1c95d4fceb..ef14549182 100644
--- a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
@@ -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();
     }