From 482a7362d423a778e71b5e7fc1a7ac346d40c802 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Fri, 20 Jul 2012 14:46:33 +0000
Subject: #8291, #7666 fix Table NegativeArraySizeException when table size
 reduced by filter or otherwise, related test application

svn changeset:24018/svn branch:6.8
---
 src/com/vaadin/ui/Table.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/com')

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 55f3f27507..60b6122270 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -1479,9 +1479,10 @@ public class Table extends AbstractSelect implements Action.Container,
 
         // Collects the basic facts about the table page
         final int pagelen = getPageLength();
-        int firstIndex = getCurrentPageFirstItemIndex();
         int rows, totalRows;
         rows = totalRows = size();
+        int firstIndex = Math
+                .min(getCurrentPageFirstItemIndex(), totalRows - 1);
         if (rows > 0 && firstIndex >= 0) {
             rows -= firstIndex;
         }
-- 
cgit v1.2.3