You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by de...@apache.org on 2017/02/26 14:16:36 UTC

svn commit: r1784446 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java

Author: deki
Date: Sun Feb 26 14:16:36 2017
New Revision: 1784446

URL: http://svn.apache.org/viewvc?rev=1784446&view=rev
Log:
TOBAGO 1705 tc sheet is empty after filtering results [developed by hnoeth]

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java?rev=1784446&r1=1784445&r2=1784446&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java Sun Feb 26 14:16:36 2017
@@ -537,7 +537,11 @@ public class SheetRenderer extends Rende
     boolean emptySheet = true;
     // rows = 0 means: show all
     final int last = sheet.isRowsUnlimited() ? Integer.MAX_VALUE : sheet.getFirst() + sheet.getRows();
-    for (int rowIndex = sheet.getFirst(); rowIndex < last; rowIndex++) {
+    final int first = sheet.getFirst();
+    final int rowCount = sheet.getRowCount();
+    final int firstRowIndexOfLastPage = sheet.getFirstRowIndexOfLastPage();
+
+    for (int rowIndex = first < rowCount ? first : firstRowIndexOfLastPage; rowIndex < last; rowIndex++) {
       sheet.setRowIndex(rowIndex);
       if (!sheet.isRowAvailable()) {
         break;