diff options
author | Henri Sara <hesara@vaadin.com> | 2012-10-24 08:58:13 +0000 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2012-10-24 08:58:13 +0000 |
commit | 546c3c096625d07f527e058a32dfeff66f823e7e (patch) | |
tree | 9e843b67bfcf0dcab5c96358136eb9fa60f7b8bc /server/src/com | |
parent | de4669b0d88a124398fc6a472b9a4dee385d56b6 (diff) | |
parent | 703dfa76b676900435b0f6098bcecc03f691651b (diff) | |
download | vaadin-framework-546c3c096625d07f527e058a32dfeff66f823e7e.tar.gz vaadin-framework-546c3c096625d07f527e058a32dfeff66f823e7e.zip |
Merge "Fixed NPE when converter is null (#10043)"
Diffstat (limited to 'server/src/com')
-rw-r--r-- | server/src/com/vaadin/ui/AbstractField.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java index 59f730f275..53301f093a 100644 --- a/server/src/com/vaadin/ui/AbstractField.java +++ b/server/src/com/vaadin/ui/AbstractField.java @@ -687,19 +687,18 @@ public abstract class AbstractField<T> extends AbstractComponent implements */ private Object convertToModel(T fieldValue) throws Converter.ConversionException { + Class<?> modelType = null; + Property pd = getPropertyDataSource(); + if (pd != null) { + modelType = pd.getType(); + } else if (getConverter() != null) { + modelType = getConverter().getModelType(); + } try { - Class<?> modelType = null; - Property pd = getPropertyDataSource(); - if (pd != null) { - modelType = pd.getType(); - } else if (getConverter() != null) { - modelType = getConverter().getModelType(); - } return ConverterUtil.convertToModel(fieldValue, (Class<Object>) modelType, getConverter(), getLocale()); } catch (ConversionException e) { - throw new ConversionException( - getConversionError(converter.getModelType()), e); + throw new ConversionException(getConversionError(modelType), e); } } |