Author: markt
Date: Mon Apr 23 13:24:59 2018
New Revision: 1829879
URL: http://svn.apache.org/viewvc?rev=1829879&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62287
Do not rely on hash codes to test instances of ValueExpressionImpl for
equality. Patch provided by Mark Struberg.
Modified:
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java?rev=1829879&r1=1829878&r2=1829879&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java Mon Apr 23
13:24:59 2018
@@ -118,8 +118,14 @@ public final class ValueExpressionImpl e
*/
@Override
public boolean equals(Object obj) {
- return (obj instanceof ValueExpressionImpl && obj.hashCode() == this
- .hashCode());
+ if (!(obj instanceof ValueExpressionImpl)) {
+ return false;
+ }
+ if (obj.hashCode() != this.hashCode()) {
+ return false;
+ }
+
+ return this.getNode().equals(((ValueExpressionImpl) obj).getNode());
}
/*
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1829879&r1=1829878&r2=1829879&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 23 13:24:59 2018
@@ -102,6 +102,11 @@
Add support for specifing Java 10 (with the value <code>10</code>) as
the compiler source and/or compiler target for JSP compilation. (markt)
</add>
+ <fix>
+ <bug>62287</bug>: Do not rely on hash codes to test instances of
+ <code>ValueExpressionImpl</code> for equality. Patch provided by Mark
+ Struberg. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
