Merge changes from origin/7.1

74dcb6f Correct assertion message which changed due to #12915
12b6a8b Test for broken Webkit feature which causes extra scrollbars (#12736, #12727)
ea46029 Allow excluding test from the standard test suite
c171850 Disable client timeout so websockets are not disconnected when idle (#13015)
36fce65 Test for pushing for an extended period of time (24h)
54a5667 Fix compilation error
25fc48c Do not throw NPE if conversion messages is null (#12962)
26b5b67 Timeout redirect timer is reset on server activity (#12446)
d45785d Fixes right click selection focus issues in Tree. (#12618)

Change-Id: I3cef915ee46b77ca0f188296cfa343cde1ad59e6

2 files changed, 24 insertions, 8 deletions

diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index cecce59e97..300e130c4e 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;
     }
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionError.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionError.java
index ad762f8931..887f1b8ff3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionError.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionError.java
@@ -54,6 +54,21 @@ public class AbsFieldValueConversionError extends TestCase {
 
     }
 
+    public void testNullConversionMessages() {
+        TextField tf = new TextField();
+        tf.setConverter(new StringToIntegerConverter());
+        tf.setPropertyDataSource(new MethodProperty<String>(paulaBean, "age"));
+        tf.setConversionError(null);
+        tf.setValue("abc");
+        try {
+            tf.validate();
+            fail();
+        } catch (InvalidValueException e) {
+            Assert.assertEquals(null, e.getMessage());
+        }
+
+    }
+
     public void testDefaultConversionErrorMessage() {
         TextField tf = new TextField();
         tf.setConverter(new StringToIntegerConverter());