Merged #2799 to 6.0.

svn changeset:7163/svn branch:6.0

diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java
index fe3b6080aac4eb809f914bcb45dc0caa3f376945..b15831a4c1d01af99739d7006b08f271daef718b 100644 (file)
--- a/src/com/itmill/toolkit/ui/Table.java
+++ b/src/com/itmill/toolkit/ui/Table.java
@@ -2551,9 +2551,11 @@ public class Table extends AbstractSelect implements Action.Container,
         super.containerItemSetChange(event);
         if (event instanceof IndexedContainer.ItemSetChangeEvent) {
             IndexedContainer.ItemSetChangeEvent evt = (IndexedContainer.ItemSetChangeEvent) event;
+            // if the event is not a global one and the added item is outside
+            // the visible/buffered area, no need to do anything
             if (evt.getAddedItemIndex() != -1
-                    && firstToBeRenderedInClient <= evt.getAddedItemIndex()
-                    && lastToBeRenderedInClient >= evt.getAddedItemIndex()) {
+                    && (firstToBeRenderedInClient > evt.getAddedItemIndex() || lastToBeRenderedInClient < evt
+                            .getAddedItemIndex())) {
                 return;
             }
         }