[myfaces-trinidad] branch master updated: Use Objects.equals(String, String) to avoid possible NullPointerException

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad.git


The following commit(s) were added to refs/heads/master by this push:
     new 14fc058  Use Objects.equals(String,String) to avoid possible NullPointerException
     new fd514d2  Merge pull request #2 from bd2019us/prwork
14fc058 is described below

commit 14fc05802f75fcd03ea91e9c102b61a016bfe08e
Author: bd2019us <bd...@126.com>
AuthorDate: Sat Apr 13 22:39:09 2019 -0500

    Use Objects.equals(String,String) to avoid possible NullPointerException
---
 .../main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java b/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java
index d9df442..8b66ecd 100644
--- a/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java
+++ b/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -235,12 +236,12 @@ public class ChangeBean
     if (numChildren == 0)
       return;
     String eventSourceId = eventSource.getId();    
-    if (eventSourceId.equals("cb2"))
+    if (Objects.equals(eventSourceId,"cb2"))
     {
       _removeChild(uic, "sic1");
       _removeChild(uic, "cc1");
     }
-    else if (eventSourceId.equals("cb3"))
+    else if (Objects.equals(eventSourceId,"cb3"))
     {
       _removeChild(uic, "cd1");
       _removeChild(uic, "sid1");