You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2010/07/30 20:27:40 UTC
svn commit: r980911 -
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
Author: mikemccand
Date: Fri Jul 30 18:27:40 2010
New Revision: 980911
URL: http://svn.apache.org/viewvc?rev=980911&view=rev
Log:
LUCENE-2580: fix AIOOBE in MultiPhraseQuery
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=980911&r1=980910&r2=980911&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java Fri Jul 30 18:27:40 2010
@@ -175,8 +175,8 @@ public class MultiPhraseQuery extends Qu
PhraseQuery.PostingsAndFreq[] postingsFreqs = new PhraseQuery.PostingsAndFreq[termArrays.size()];
- for (int i=0; i<postingsFreqs.length; i++) {
- Term[] terms = termArrays.get(i);
+ for (int pos=0; pos<postingsFreqs.length; pos++) {
+ Term[] terms = termArrays.get(pos);
final DocsAndPositionsEnum postingsEnum;
int docFreq;
@@ -187,8 +187,8 @@ public class MultiPhraseQuery extends Qu
// coarse -- this overcounts since a given doc can
// have more than one terms:
docFreq = 0;
- for(int j=0;j<terms.length;j++) {
- docFreq += reader.docFreq(terms[i]);
+ for(int termIdx=0;termIdx<terms.length;termIdx++) {
+ docFreq += reader.docFreq(terms[termIdx]);
}
} else {
final BytesRef text = new BytesRef(terms[0].text());
@@ -209,7 +209,7 @@ public class MultiPhraseQuery extends Qu
docFreq = reader.docFreq(terms[0].field(), text);
}
- postingsFreqs[i] = new PhraseQuery.PostingsAndFreq(postingsEnum, docFreq, positions.get(i).intValue());
+ postingsFreqs[pos] = new PhraseQuery.PostingsAndFreq(postingsEnum, docFreq, positions.get(pos).intValue());
}
// sort by increasing docFreq order