summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-02 20:45:30 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2015-11-03 13:59:28 +0000
commitffb28784b7e9b612a63edd997c4ecbcc3797cc73 (patch)
treee80c1392994cd9995d89dbedd23d38091290b44f /server/src/com/vaadin
parentbaa8da38adeac92a3acecd9501ecbbafe5815f88 (diff)
downloadvaadin-framework-ffb28784b7e9b612a63edd997c4ecbcc3797cc73.tar.gz
vaadin-framework-ffb28784b7e9b612a63edd997c4ecbcc3797cc73.zip
Render null header caption as empty (#18553)
Change-Id: Iaeba81c7e40d4be5f16e74fa8bcf8c86c53a7d3d
Diffstat (limited to 'server/src/com/vaadin')
-rw-r--r--server/src/com/vaadin/ui/Grid.java4
1 files changed, 3 insertions, 1 deletions
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();