You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2021/10/11 11:18:06 UTC
[myfaces-tobago] branch master updated: fix(popup): NPE in new
popup design
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new cb6b478 fix(popup): NPE in new popup design
cb6b478 is described below
commit cb6b47881843b43bb2b18c332e75f86418949311
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Mon Oct 11 13:10:22 2021 +0200
fix(popup): NPE in new popup design
Fix NPE if using new popup design without bar-facet.
---
.../internal/renderkit/renderer/PopupRenderer.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
index d0eac06..1059ac9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
@@ -82,17 +82,21 @@ public class PopupRenderer<T extends AbstractUIPopup> extends CollapsiblePanelRe
writer.startElement(HtmlElements.H5);
writer.writeClassAttribute(BootstrapClass.MODAL_TITLE);
insideBegin(facesContext, Facets.label);
- for (final UIComponent child : RenderUtils.getFacetChildren(labelFacet)) {
- child.encodeAll(facesContext);
+ if (labelFacet != null) {
+ for (final UIComponent child : RenderUtils.getFacetChildren(labelFacet)) {
+ child.encodeAll(facesContext);
+ }
}
insideEnd(facesContext, Facets.label);
writer.endElement(HtmlElements.H5);
- insideBegin(facesContext, Facets.bar);
- for (final UIComponent child : RenderUtils.getFacetChildren(barFacet)) {
- child.encodeAll(facesContext);
+ if (barFacet != null) {
+ insideBegin(facesContext, Facets.bar);
+ for (final UIComponent child : RenderUtils.getFacetChildren(barFacet)) {
+ child.encodeAll(facesContext);
+ }
+ insideEnd(facesContext, Facets.bar);
}
- insideEnd(facesContext, Facets.bar);
writer.endElement(HtmlElements.DIV);
}