Author: konstantin.mishin Date: 2011-02-07 08:00:15 -0500 (Mon, 07 Feb 2011) New Revision: 21499 Modified: branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java Log: RF-10417 Modified: branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java =================================================================== --- branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2011-02-07 11:59:55 UTC (rev 21498) +++ branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2011-02-07 13:00:15 UTC (rev 21499) @@ -156,7 +156,11 @@ int shiftRowIndex = clientSelection.getShiftRowIndex(); if (shiftRowIndex != -1) { int rows = grid.getRows(); - grid.setShiftRowIndex(grid.getFirst() + (rows + shiftRowIndex - clientRowIndex) % rows); + if (rows > 0) + grid.setShiftRowIndex(grid.getFirst() + (rows + shiftRowIndex - clientRowIndex) % rows); + else { + grid.setShiftRowIndex(grid.getFirst() + shiftRowIndex - clientRowIndex); + } } ScrollableDataTableRendererState.restoreState(context); }