Use Objects.equals()

Author: dizzzz

exist-core/src/main/java/org/exist/security/internal/Password.java

@@ -21,6 +21,7 @@
  */
 package org.exist.security.internal;
 
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.codec.binary.Base64;
@@ -169,7 +170,7 @@ public boolean equals(Object obj) {
                 throw new RuntimeException("Cannot compare passwords with different algorithms i.e. " + algorithm + " and " + p.algorithm);
             }
 
-            return (pw == p.pw || (pw != null && pw.equals(p.pw)));
+            return (Objects.equals(pw, p.pw));
         }
 
     	if(obj instanceof String) {

exist-core/src/main/java/org/exist/xquery/functions/fn/FunDeepEqual.java

@@ -55,6 +55,8 @@
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
+import java.util.Objects;
+
 /**
  * Implements the fn:deep-equal library function.
  *
@@ -358,7 +360,7 @@ private static boolean compareNames(Node a, Node b) {
     }
 
     private static boolean safeEquals(Object a, Object b) {
-        return a == null ? b == null : a.equals(b);
+        return Objects.equals(a, b);
     }
 
 }