From ffb28784b7e9b612a63edd997c4ecbcc3797cc73 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 2 Sep 2015 20:45:30 +0300
Subject: Render null header caption as empty (#18553)

Change-Id: Iaeba81c7e40d4be5f16e74fa8bcf8c86c53a7d3d
---
 server/src/com/vaadin/ui/Grid.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'server/src')

diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 5dfb8e83ed..0f3e634ed3 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -3250,7 +3250,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         public Column setHeaderCaption(String caption)
                 throws IllegalStateException {
             checkColumnIsAttached();
-
+            if (caption == null) {
+                caption = ""; // Render null as empty
+            }
             state.headerCaption = caption;
 
             HeaderRow row = grid.getHeader().getDefaultRow();
-- 
cgit v1.2.3