Merge remote-tracking branch 'origin/6.8'

2 files changed, 15 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperIE.java b/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperIE.java
index 89f063eaf9..0032b1a5dc 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperIE.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapperIE.java
@@ -1,3 +1,7 @@
+/* 
+@ITMillApache2LicenseForJavaFiles@
+ */
+
 package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.dom.client.AnchorElement;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
index bcd87da751..fc6ec46d64 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
@@ -81,6 +81,7 @@ public class VTreeTable extends VScrollTable {
         colIndexOfHierarchy = uidl
                 .hasAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) ? uidl
                 .getIntAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) : 0;
+        int oldTotalRows = getTotalRows();
         super.updateFromUIDL(uidl, client);
         if (collapseRequest) {
             if (collapsedRowKey != null && scrollBody != null) {
@@ -96,15 +97,19 @@ public class VTreeTable extends VScrollTable {
                 widget.setScrollPosition(scrollPosition);
             }
 
-            /*
-             * Triggers row calculations, removes cached rows etc. Basically
-             * cleans up state. Be careful if touching this, you will brake
-             * pageLength=0 if you remove this.
-             */
+            // check which rows are needed from the server and initiate a
+            // deferred fetch
             onScroll(null);
-
+        }
+        // Recalculate table size if collapse request, or if page length is zero
+        // (not sent by server) and row count changes (#7908).
+        if (collapseRequest
+                || (!uidl.hasAttribute("pagelength") && getTotalRows() != oldTotalRows)) {
             /*
              * Ensure that possibly removed/added scrollbars are considered.
+             * Triggers row calculations, removes cached rows etc. Basically
+             * cleans up state. Be careful if touching this, you will break
+             * pageLength=0 if you remove this.
              */
             triggerLazyColumnAdjustment(true);