From 452f7537258a74225525bcd99b1bae7d7e0cb4de Mon Sep 17 00:00:00 2001 From: Naveen Vardhi Date: Mon, 17 Sep 2018 20:11:59 +0530 Subject: [PATCH] Corrected equals method Fixes the comparison of an extended class of QueryValueSource --- .../queries/function/valuesource/QueryValueSource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java index e535b55018f4..1e67e87d802d 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java @@ -65,7 +65,8 @@ public int hashCode() { @Override public boolean equals(Object o) { - if (QueryValueSource.class != o.getClass()) return false; + if (o == null) return false; + if (getClass() != o.getClass()) return false; QueryValueSource other = (QueryValueSource)o; return this.q.equals(other.q) && this.defVal==other.defVal; } @@ -254,4 +255,4 @@ public void fillValue(int doc) { public String toString(int doc) { return "query(" + q + ",def=" + defVal + ")=" + floatVal(doc); } -} \ No newline at end of file +}