myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: refactored
Date Wed, 16 Oct 2019 11:31:04 GMT
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.git


The following commit(s) were added to refs/heads/master by this push:
     new b7351ca  refactored
b7351ca is described below

commit b7351caa2e769edd2d56bc56e52b9af76c22958f
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Wed Oct 16 13:30:57 2019 +0200

    refactored
---
 .../view/facelets/el/ValueExpressionMethodExpression.java        | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
index db76c43..722e799 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
@@ -22,6 +22,7 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.util.Objects;
 
 import javax.el.ELContext;
 import javax.el.MethodExpression;
@@ -90,13 +91,9 @@ public class ValueExpressionMethodExpression extends MethodExpression
         {
             return false;
         }
+
         ValueExpressionMethodExpression other = (ValueExpressionMethodExpression) obj;
-        if ((this.valueExpression == null && other.valueExpression != null) || 
-             (this.valueExpression != null && !this.valueExpression.equals(other.valueExpression)))
-        {
-            return false;
-        }
-        return true;
+        return Objects.equals(this.valueExpression, other.valueExpression);
     }
 
     @Override


Mime
View raw message