From b2052a90a1d1cccf011f7b5295e09e66f155e046 Mon Sep 17 00:00:00 2001 From: Sauli Tähkäpää Date: Mon, 26 May 2014 10:56:50 +0300 Subject: Revert "Fix Push inserts producing duplicate rows in Table (#13562)" This reverts commit ce1764fb1bad1b82462d73fbfe293b676c2a9c00. --- server/src/com/vaadin/ui/Table.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'server') diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index 29dc52a9a6..b4d79f304c 100644 --- a/server/src/com/vaadin/ui/Table.java +++ b/server/src/com/vaadin/ui/Table.java @@ -2954,23 +2954,15 @@ public class Table extends AbstractSelect implements Action.Container, // (row caches emptied by other event) if (!containerChangeToBeRendered) { Integer value = (Integer) variables.get("reqfirstrow"); - int tableSize = size(); if (value != null) { reqFirstRowToPaint = value.intValue(); - // Sanity check - if (reqFirstRowToPaint < 0) { - reqFirstRowToPaint = -1; - } - if (reqFirstRowToPaint >= tableSize) { - reqFirstRowToPaint = tableSize - 1; - } } value = (Integer) variables.get("reqrows"); if (value != null) { reqRowsToPaint = value.intValue(); // sanity check - if (reqFirstRowToPaint + reqRowsToPaint > tableSize) { - reqRowsToPaint = tableSize - reqFirstRowToPaint; + if (reqFirstRowToPaint + reqRowsToPaint > size()) { + reqRowsToPaint = size() - reqFirstRowToPaint; } } } -- cgit v1.2.3