You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/10/08 10:22:14 UTC
svn commit: r1843126 - /tomcat/trunk/java/javax/el/Util.java
Author: markt
Date: Mon Oct 8 10:22:14 2018
New Revision: 1843126
URL: http://svn.apache.org/viewvc?rev=1843126&view=rev
Log:
Trivial commit to test CI
Modified:
tomcat/trunk/java/javax/el/Util.java
Modified: tomcat/trunk/java/javax/el/Util.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1843126&r1=1843125&r2=1843126&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/Util.java (original)
+++ tomcat/trunk/java/javax/el/Util.java Mon Oct 8 10:22:14 2018
@@ -811,25 +811,21 @@ class Util {
@Override
public boolean equals(Object o)
{
- return o == this
- || (null != o
- && this.getClass().equals(o.getClass())
- && ((MatchResult)o).getExact() == this.getExact()
- && ((MatchResult)o).getAssignable() == this.getAssignable()
- && ((MatchResult)o).getCoercible() == this.getCoercible()
- && ((MatchResult)o).isBridge() == this.isBridge()
- )
- ;
+ return o == this || (null != o &&
+ this.getClass().equals(o.getClass()) &&
+ ((MatchResult)o).getExact() == this.getExact() &&
+ ((MatchResult)o).getAssignable() == this.getAssignable() &&
+ ((MatchResult)o).getCoercible() == this.getCoercible() &&
+ ((MatchResult)o).isBridge() == this.isBridge());
}
@Override
public int hashCode()
{
- return (this.isBridge() ? 1 << 24 : 0)
- ^ this.getExact() << 16
- ^ this.getAssignable() << 8
- ^ this.getCoercible()
- ;
+ return (this.isBridge() ? 1 << 24 : 0) ^
+ this.getExact() << 16 ^
+ this.getAssignable() << 8 ^
+ this.getCoercible();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org