You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2013/03/08 10:41:02 UTC

svn commit: r1454304 - /myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java

Author: weber
Date: Fri Mar  8 09:41:02 2013
New Revision: 1454304

URL: http://svn.apache.org/r1454304
Log:
TOBAGO-1238 - NPE on UIComponent getter when rendererType == null

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1454304&r1=1454303&r2=1454304&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Fri Mar  8 09:41:02 2013
@@ -620,7 +620,7 @@ public class SheetRenderer extends Layou
   }
 
   private Measure getHeaderHeight(FacesContext facesContext, UISheet sheet) {
-    int rows = sheet.getHeaderGrid().getRowCount();
+    int rows = sheet.getHeaderGrid() != null ? sheet.getHeaderGrid().getRowCount() : 0;
     return sheet.isShowHeader()
         ? getResourceManager().getThemeMeasure(facesContext, sheet, "headerHeight").multiply(rows)
         : Measure.ZERO;