You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/02/22 17:31:48 UTC

[2/2] lucene-solr:branch_6_4: SOLR-10083: Fix instanceof check in ConstDoubleSource.equals (Pushkar Raste via Christine Poerschke)

SOLR-10083: Fix instanceof check in ConstDoubleSource.equals (Pushkar Raste via Christine Poerschke)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/701525bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/701525bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/701525bc

Branch: refs/heads/branch_6_4
Commit: 701525bc0bcb440652b734c645f1d17c88d9cdd7
Parents: e0653d9
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Feb 8 17:18:02 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Feb 22 17:19:50 2017 +0000

----------------------------------------------------------------------
 solr/CHANGES.txt                                                  | 2 ++
 .../apache/solr/analytics/util/valuesource/ConstDoubleSource.java | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/701525bc/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 31c9796..6299018 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -40,6 +40,8 @@ Bug Fixes
 
 * SOLR-10138: Transaction log replay can hit an NPE due to new Metrics code. (ab)
 
+* SOLR-10083: Fix instanceof check in ConstDoubleSource.equals (Pushkar Raste via Christine Poerschke)
+
 ==================  6.4.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/701525bc/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
index 80e8ed1..e0ebad6 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
@@ -23,7 +23,6 @@ import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
 import org.apache.lucene.queries.function.valuesource.ConstNumberSource;
-import org.apache.lucene.queries.function.valuesource.ConstValueSource;
 import org.apache.solr.analytics.util.AnalyticsParams;
 
 /**
@@ -67,7 +66,7 @@ public class ConstDoubleSource extends ConstNumberSource {
 
   @Override
   public boolean equals(Object o) {
-    if (!(o instanceof ConstValueSource)) return false;
+    if (!(o instanceof ConstDoubleSource)) return false;
     ConstDoubleSource other = (ConstDoubleSource)o;
     return  this.constant == other.constant;
   }