You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/05/14 13:29:52 UTC
svn commit: r1103052 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/
lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
solr/
Author: rmuir
Date: Sat May 14 11:29:51 2011
New Revision: 1103052
URL: http://svn.apache.org/viewvc?rev=1103052&view=rev
Log:
LUCENE-1421: add workaround to unbreak the build
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java?rev=1103052&r1=1103051&r2=1103052&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java Sat May 14 11:29:51 2011
@@ -227,7 +227,9 @@ public class FirstPassGroupingCollector
// We already tested that the document is competitive, so replace
// the bottom group with this new group.
- final CollectedSearchGroup bottomGroup = orderedGroups.pollLast();
+ // java 6-only: final CollectedSearchGroup bottomGroup = orderedGroups.pollLast();
+ final CollectedSearchGroup bottomGroup = orderedGroups.last();
+ orderedGroups.remove(bottomGroup);
assert orderedGroups.size() == topNGroups -1;
groupMap.remove(bottomGroup.groupValue);