diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-26 22:42:09 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-11-26 22:42:09 +0200 |
| commit | 07f915d7fc441a8fc0a161d34c9b2567ae42f5c8 (patch) | |
| tree | 38a5e367b1f8dc2d82c9f39ae86146c50abbdb00 | |
| parent | c27a7044bb0ed55eb51b53bd7b2bd9204d614383 (diff) | |
| download | vaadin-framework-07f915d7fc441a8fc0a161d34c9b2567ae42f5c8.tar.gz vaadin-framework-07f915d7fc441a8fc0a161d34c9b2567ae42f5c8.zip | |
Fixed NPE when converting ""
Change-Id: I0cdde2ae9a1c40ebe41a2d1f91f972fe803d455f
| -rw-r--r-- | server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java | 5 |
1 files changed, 5 insertions, 0 deletions
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(); } |