From bec7308ca3f71122d62f743ba7ac376a66b1b6b2 Mon Sep 17 00:00:00 2001
From: Artur <artur@vaadin.com>
Date: Mon, 13 Mar 2017 08:29:26 +0200
Subject: Fix detach of grid when it contains frozen columns (#8803)

* Fix detach of grid when it contains frozen columns

Fixes #8748
---
 .../java/com/vaadin/client/connectors/grid/ColumnConnector.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'client')

diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java
index 1b2574f4a8..d619b50b5d 100644
--- a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java
@@ -140,8 +140,12 @@ public class ColumnConnector extends AbstractExtensionConnector {
     @Override
     public void onUnregister() {
         super.onUnregister();
-
-        parent.removeColumn(column);
+        if (parent.getParent() != null) {
+            // If the grid itself was unregistered there is no point in spending
+            // time to remove columns (and have problems with frozen columns)
+            // before throwing everything away
+            parent.removeColumn(column);
+        }
         column = null;
     }
 
-- 
cgit v1.2.3