From 77a921791a318c60d25f5bb19823d8c2850732b0 Mon Sep 17 00:00:00 2001
From: Anastasia Smirnova <anasmi@utu.fi>
Date: Fri, 7 Sep 2018 11:39:48 +0300
Subject: Ensure that HeaderRow is not null in Grid (#11165)

Ensure that HeaderRow is not null in Grid

Fixes #10485
---
 client/src/main/java/com/vaadin/client/widgets/Grid.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'client')

diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index fd32ca8243..e382d2a4f1 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -3411,6 +3411,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
             // Make SelectAllCheckbox visible
             getSelectionColumn().ifPresent(col -> {
+                if (getDefaultHeaderRow() == null)
+                    return;
                 HeaderCell headerCell = getDefaultHeaderRow().getCell(col);
                 if (headerCell.getType().equals(GridStaticCellType.WIDGET)) {
                     // SelectAllCheckbox is present already
-- 
cgit v1.2.3