diff options
author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-05-26 10:56:50 +0300 |
---|---|---|
committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-05-26 11:00:14 +0300 |
commit | b2052a90a1d1cccf011f7b5295e09e66f155e046 (patch) | |
tree | f7eff059ae2e233d1cadc9c737cbca2f41195545 /server | |
parent | 2a71c0deb62bc576d80b7720312876da5f684e6c (diff) | |
download | vaadin-framework-b2052a90a1d1cccf011f7b5295e09e66f155e046.tar.gz vaadin-framework-b2052a90a1d1cccf011f7b5295e09e66f155e046.zip |
Revert "Fix Push inserts producing duplicate rows in Table (#13562)"
This reverts commit ce1764fb1bad1b82462d73fbfe293b676c2a9c00.
Diffstat (limited to 'server')
-rw-r--r-- | server/src/com/vaadin/ui/Table.java | 12 |
1 files changed, 2 insertions, 10 deletions
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; } } } |