merged [11858] from 6.3

svn changeset:11861/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 465f4b38ae6a3bbbff9c6bc6e53eadce0a8e0a97..4dde2b69cda7caa849f918050274a342da3e23f4 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1649,7 +1649,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler {
         @Override
         protected void onDetach() {
             super.onDetach();
-            client.getContextMenu().ensureHidden(this);
+            if (client != null) {
+                client.getContextMenu().ensureHidden(this);
+            }
         }
 
         class VisibleColumnAction extends Action {