Fixed NPE when converter is null (#10043)

Change-Id: I1d753a4da16feae0c83d755e9dcceae86f3dfbdc

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);
         }
     }