Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: java-dev@lucene.apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r416111 - in /lucene/java/trunk: CHANGES.txt
 src/java/org/apache/lucene/search/BooleanScorer2.java
Date: Wed, 21 Jun 2006 21:11:53 -0000
To: java-commits@lucene.apache.org
From: yonik@apache.org
Message-Id: <20060621211153.EDF5E1A983A@eris.apache.org>

Author: yonik
Date: Wed Jun 21 14:11:53 2006
New Revision: 416111

URL: http://svn.apache.org/viewvc?rev=416111&view=rev
Log:
disambiguate inner class call to doc() for ecj compilation: LUCENE-610

Modified:
    lucene/java/trunk/CHANGES.txt
    lucene/java/trunk/src/java/org/apache/lucene/search/BooleanScorer2.java

Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=416111&r1=416110&r2=416111&view=diff
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Wed Jun 21 14:11:53 2006
@@ -56,6 +56,10 @@
     a non-empty segment file to be re-used, causing index corruption.
     (Andy Hind via Yonik Seeley)
 
+10. LUCENE-610: Simple syntax change to allow compilation with ecj : 
+    disambiguate inner class scorer's use of doc() in BooleanScorer2.
+    (DM Smith via Yonik Seeley)
+
 Optimizations
 
   1. LUCENE-586: TermDocs.skipTo() is now more efficient for multi-segment

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/BooleanScorer2.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/BooleanScorer2.java?rev=416111&r1=416110&r2=416111&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/BooleanScorer2.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/BooleanScorer2.java Wed Jun 21 14:11:53 2006
@@ -130,8 +130,8 @@
       this.scorer = scorer;
     }
     public float score() throws IOException {
-      if (doc() > lastScoredDoc) {
-        lastScoredDoc = doc();
+      if (this.doc() > lastScoredDoc) {
+        lastScoredDoc = this.doc();
         coordinator.nrMatchers++;
       }
       return scorer.score();
@@ -157,8 +157,8 @@
     return new DisjunctionSumScorer(scorers, minMrShouldMatch) {
       private int lastScoredDoc = -1;
       public float score() throws IOException {
-        if (doc() > lastScoredDoc) {
-          lastScoredDoc = doc();
+        if (this.doc() > lastScoredDoc) {
+          lastScoredDoc = this.doc();
           coordinator.nrMatchers += super.nrMatchers;
         }
         return super.score();
@@ -175,8 +175,8 @@
       private int lastScoredDoc = -1;
 
       public float score() throws IOException {
-        if (doc() > lastScoredDoc) {
-          lastScoredDoc = doc();
+        if (this.doc() > lastScoredDoc) {
+          lastScoredDoc = this.doc();
           coordinator.nrMatchers += requiredNrMatchers;
         }
         // All scorers match, so defaultSimilarity super.score() always has 1 as