From 2eef2dfdc542e878b04c5628410a47b4b934e85f Mon Sep 17 00:00:00 2001 From: Koji Sekiguchi Date: Mon, 8 Jun 2009 02:27:06 +0000 Subject: [PATCH] SOLR-1207: equals method should compare this and other of DocList in DocSetBase git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@782506 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ src/java/org/apache/solr/search/DocSet.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 417010e4fbe..91df91c4ce3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -409,6 +409,8 @@ Bug Fixes 48. SOLR-1182: Fix bug in OrdFieldSource#equals which could cause a bug with OrdFieldSource caching on OrdFieldSource#hashcode collisions. (Mark Miller) +49. SOLR-1207: equals method should compare this and other of DocList in DocSetBase (koji) + Other Changes ---------------------- diff --git a/src/java/org/apache/solr/search/DocSet.java b/src/java/org/apache/solr/search/DocSet.java index 02d2e312ca0..058faf13d45 100644 --- a/src/java/org/apache/solr/search/DocSet.java +++ b/src/java/org/apache/solr/search/DocSet.java @@ -162,7 +162,7 @@ abstract class DocSetBase implements DocSet { if (this instanceof DocList && other instanceof DocList) { // compare ordering DocIterator i1=this.iterator(); - DocIterator i2=this.iterator(); + DocIterator i2=other.iterator(); while(i1.hasNext() && i2.hasNext()) { if (i1.nextDoc() != i2.nextDoc()) return false; }