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 2020/06/04 19:59:19 UTC

[myfaces-tobago] branch master updated: fix: NPE in tobago-tree

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 850fadf  fix: NPE in tobago-tree
850fadf is described below

commit 850fadfc1bcb9a0cc6c8737a762c1af989027338
Author: Henning Nöth <hn...@apache.org>
AuthorDate: Wed Jun 3 15:27:16 2020 +0200

    fix: NPE in tobago-tree
    
    Issue: TOBAGO-1633
---
 .../internal/renderkit/renderer/TreeSelectRenderer.java      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
index 69152ec..e903c75 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
@@ -47,6 +47,7 @@ import javax.faces.component.UINamingContainer;
 import javax.faces.context.FacesContext;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
+import java.util.Map;
 
 public class TreeSelectRenderer extends RendererBase {
 
@@ -136,9 +137,14 @@ public class TreeSelectRenderer extends RendererBase {
       writer.endElement(HtmlElements.INPUT);
 
       final CommandMap behaviorCommands = getBehaviorCommands(facesContext, treeSelect);
-      Command change = behaviorCommands.getOther().get(ClientBehaviors.change);
-      change.setExecute(change.getExecute() + " " + tree.getClientId(facesContext));
-      change.setRender(change.getRender() + " " + tree.getClientId(facesContext));
+      if (behaviorCommands != null) {
+        Map<ClientBehaviors, Command> other = behaviorCommands.getOther();
+        if (other != null) {
+          Command change = other.get(ClientBehaviors.change);
+          change.setExecute(change.getExecute() + " " + tree.getClientId(facesContext));
+          change.setRender(change.getRender() + " " + tree.getClientId(facesContext));
+        }
+      }
       encodeBehavior(writer, behaviorCommands);
     }