Merge remote-tracking branch 'origin/6.8'

Conflicts:
	WebContent/VAADIN/themes/base/table/table.css
	WebContent/release-notes.html
	build/build.xml
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
	src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
	src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
	src/com/vaadin/terminal/gwt/client/ui/VSlider.java
	src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
	src/com/vaadin/terminal/gwt/client/ui/VWindow.java
	src/com/vaadin/ui/Table.java
	tests/integration_tests.xml
	tests/test.xml
	tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java

1 files changed, 12 insertions, 0 deletions

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index ec620ddcd5..6a946560cf 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -3052,6 +3052,9 @@ public class Table extends AbstractSelect implements Action.Container,
         if (start > cells[CELL_ITEMID].length || start < 0) {
             start = 0;
         }
+        if (end > cells[CELL_ITEMID].length) {
+            end = cells[CELL_ITEMID].length;
+        }
 
         for (int indexInRowbuffer = start; indexInRowbuffer < end; indexInRowbuffer++) {
             final Object itemId = cells[CELL_ITEMID][indexInRowbuffer];
@@ -5188,4 +5191,13 @@ public class Table extends AbstractSelect implements Action.Container,
         return propertyValueConverters.get(propertyId);
     }
 
+    @Override
+    public void setVisible(boolean visible) {
+        if (!isVisible() && visible) {
+            // We need to ensure that the rows are sent to the client when the
+            // Table is made visible if it has been rendered as invisible.
+            setRowCacheInvalidated(true);
+        }
+        super.setVisible(visible);
+    }
 }