You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/10/16 16:29:30 UTC

svn commit: r1709013 - /myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java

Author: lofwyr
Date: Fri Oct 16 14:29:29 2015
New Revision: 1709013

URL: http://svn.apache.org/viewvc?rev=1709013&view=rev
Log:
TOBAGO-1488: Toolbar for tc:box in Bootstrap
- fix NPE

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java?rev=1709013&r1=1709012&r2=1709013&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java Fri Oct 16 14:29:29 2015
@@ -75,7 +75,7 @@ public class BoxRenderer extends BoxRend
             writer.writeClassAttribute(BootstrapClass.PANEL_TITLE);
             if (label != null) {
                 RenderUtils.encode(facesContext, label);
-            } else {
+            } else if (labelString != null) {
                 writer.writeText(labelString);
             }
             writer.endElement(HtmlElements.H3);