diff options
Diffstat (limited to 'server/src/main/java/com/vaadin/ui/Grid.java')
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/Grid.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index 7c3467eaa3..3d687136cd 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -3093,8 +3093,12 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents, final String diffStateKey = "frozenColumnCount"; UI ui = getUI(); if (ui != null) { - ui.getConnectorTracker().getDiffState(Grid.this) - .remove(diffStateKey); + JsonObject diffState = ui.getConnectorTracker() + .getDiffState(Grid.this); + // if diffState is not present, there's nothing for us to clean + if (diffState != null) { + diffState.remove(diffStateKey); + } } } getState().frozenColumnCount = numberOfColumns; |