You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/07/22 12:35:27 UTC

svn commit: r1149552 - /lucene/dev/branches/positions/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java

Author: simonw
Date: Fri Jul 22 10:35:26 2011
New Revision: 1149552

URL: http://svn.apache.org/viewvc?rev=1149552&view=rev
Log:
create new position iterator for each call

Modified:
    lucene/dev/branches/positions/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java

Modified: lucene/dev/branches/positions/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/positions/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java?rev=1149552&r1=1149551&r2=1149552&view=diff
==============================================================================
--- lucene/dev/branches/positions/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java (original)
+++ lucene/dev/branches/positions/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java Fri Jul 22 10:35:26 2011
@@ -32,7 +32,6 @@ class ConjunctionScorer extends Scorer {
   private final Scorer[] scorers;
   private final float coord;
   private int lastDoc = -1;
-  private PositionIntervalIterator positions;
 
   public ConjunctionScorer(Weight weight, float coord, boolean needsPositions, Collection<Scorer> scorers) throws IOException {
     this(weight, coord, needsPositions, scorers.toArray(new Scorer[scorers.size()]));
@@ -150,13 +149,11 @@ class ConjunctionScorer extends Scorer {
   
   @Override
   public PositionIntervalIterator positions() throws IOException {
-    if (positions == null) {
-      if (scorersOrdered == null)
-        throw new IllegalStateException("no positions requested for this scorer");
-      // only created if needed for this scorer - no penalty for non-positional queries
-      positions = new ConjunctionPositionIterator(this, scorersOrdered);
+    if (scorersOrdered == null) {
+      throw new IllegalStateException("no positions requested for this scorer");
     }
-    return positions;
+      // only created if needed for this scorer - no penalty for non-positional queries
+    return new ConjunctionPositionIterator(this, scorersOrdered);
   }
 
 }