From 9baf4a9c26d5129ae274cfd3ce1da0e68bb5c78b Mon Sep 17 00:00:00 2001
From: Tatu Lund <tatu@vaadin.com>
Date: Fri, 15 Nov 2019 16:04:43 +0200
Subject: Eliminate un-intuitive NPE (#11802)

* Eliminate un-intuitive NPE

Fixes https://github.com/vaadin/framework/issues/10947
---
 server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'server')

diff --git a/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
index 94fbef613d..5c074d774c 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
@@ -52,9 +52,12 @@ public class TextRenderer extends AbstractRenderer<Object, Object> {
     public JsonValue encode(Object value) {
         if (value == null) {
             return super.encode(null);
-        } else {
-            return Json.create(value.toString());
         }
+        String stringValue = value.toString();
+        if (stringValue == null) {
+            return super.encode(null);
+        }
+        return Json.create(stringValue);
     }
 
     @Override
-- 
cgit v1.2.3