aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-11-11 16:35:28 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2014-11-11 16:35:28 +0200
commiteffe4927119eed370bb7061300123877588c5432 (patch)
tree4ed087ebeef378462c3c32260072d18593260136
parentfc8738c8de916ab56a7507e2a4eca2468a86f349 (diff)
downloadvaadin-framework-effe4927119eed370bb7061300123877588c5432.tar.gz
vaadin-framework-effe4927119eed370bb7061300123877588c5432.zip
Fix NPE in GridColumn when set sortable before adding to Grid (#13334)
Change-Id: Iafa1faa59897be475295a3e6c43110c316143a75
-rw-r--r--client/src/com/vaadin/client/ui/grid/Grid.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java
index 748f5c69be..cce1094cd9 100644
--- a/client/src/com/vaadin/client/ui/grid/Grid.java
+++ b/client/src/com/vaadin/client/ui/grid/Grid.java
@@ -1153,7 +1153,9 @@ public class Grid<T> extends ResizeComposite implements
public void setSortable(boolean sortable) {
if (this.sortable != sortable) {
this.sortable = sortable;
- grid.refreshHeader();
+ if (grid != null) {
+ grid.refreshHeader();
+ }
}
}