summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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();
+ }
}
}