From e8f7de722a7561e25c6bfd1fb007f498db22b1c7 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Wed, 19 Jul 2017 09:34:05 +0300
Subject: Allow null Components in ComponentRenderer (#9692)

---
 .../client/connectors/grid/ComponentRendererConnector.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'client/src')

diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java
index c094437538..6315f119cc 100644
--- a/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/grid/ComponentRendererConnector.java
@@ -51,9 +51,13 @@ public class ComponentRendererConnector
             @Override
             public void render(RendererCellReference cell, String connectorId,
                     SimplePanel widget) {
-                ComponentConnector connector = (ComponentConnector) ConnectorMap
-                        .get(getConnection()).getConnector(connectorId);
-                widget.setWidget(connector.getWidget());
+                if (connectorId != null) {
+                    ComponentConnector connector = (ComponentConnector) ConnectorMap
+                            .get(getConnection()).getConnector(connectorId);
+                    widget.setWidget(connector.getWidget());
+                } else if (widget.getWidget() != null) {
+                    widget.remove(widget.getWidget());
+                }
             }
         };
     }
-- 
cgit v1.2.3