From 25fc48c52067237faa208cea849a775a7aa1668c Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 15 Nov 2013 18:40:57 +0200
Subject: Do not throw NPE if conversion messages is null (#12962)

Change-Id: Ie2b95ed4da89e2c5ab8b462300a6f4bd28dc7570
---
 server/src/com/vaadin/ui/AbstractField.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'server/src')

diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index 6a52d6b849..b96e331889 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -783,15 +783,16 @@ public abstract class AbstractField<T> extends AbstractComponent implements
             ConversionException e) {
         String conversionError = getConversionError();
 
-        if (dataSourceType != null) {
-            conversionError = conversionError.replace("{0}",
-                    dataSourceType.getSimpleName());
-        }
-        if (e != null) {
-            conversionError = conversionError.replace("{1}",
-                    e.getLocalizedMessage());
+        if (conversionError != null) {
+            if (dataSourceType != null) {
+                conversionError = conversionError.replace("{0}",
+                        dataSourceType.getSimpleName());
+            }
+            if (e != null) {
+                conversionError = conversionError.replace("{1}",
+                        e.getLocalizedMessage());
+            }
         }
-
         return conversionError;
     }
 
-- 
cgit v1.2.3