Handle renderer exceptions gracefully (#18554)

Change-Id: I46557f6c6f8543ab61b863145863824785d14784

1 files changed, 8 insertions, 1 deletions

diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index 6f8a7e8f7b..98394c45df 100644
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.google.gwt.thirdparty.guava.common.collect.BiMap;
@@ -1238,7 +1239,13 @@ public class RpcDataProviderExtension extends AbstractExtension {
                     safeConverter.getPresentationType(), locale);
         }
 
-        JsonValue encodedValue = renderer.encode(presentationValue);
+        JsonValue encodedValue;
+        try {
+            encodedValue = renderer.encode(presentationValue);
+        } catch (Exception e) {
+            getLogger().log(Level.SEVERE, "Unable to encode data", e);
+            encodedValue = renderer.encode(null);
+        }
 
         return encodedValue;
     }