You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/08/05 08:08:05 UTC

svn commit: r428968 - /myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java

Author: matzew
Date: Fri Aug  4 23:08:05 2006
New Revision: 428968

URL: http://svn.apache.org/viewvc?rev=428968&view=rev
Log:
putting #422749 AND #428204  	 to branch

Modified:
    myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java

Modified: myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=428968&r1=428967&r2=428968&view=diff
==============================================================================
--- myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Fri Aug  4 23:08:05 2006
@@ -212,6 +212,10 @@
         else
         {
            last = first + rows;
+           if (last > uiData.getRowCount())
+           {
+               last=uiData.getRowCount();
+           }
         }
 
         int newspaperColumns = getNewspaperColumns(component);
@@ -232,7 +236,7 @@
             uiData.setRowIndex(currentRow);
             if (!uiData.isRowAvailable()) {
                     log.error("Row is not available. Rowindex = " + currentRow);
-                    return;
+                    break;
             }
 
             beforeRow(facesContext, uiData);
@@ -255,7 +259,7 @@
                     uiData.setRowIndex(currentRow);
                     if(!uiData.isRowAvailable()) {
                         log.error("Row is not available. Rowindex = " + currentRow);
-                        return;
+                        break;
                     }
                 }