svn commit: r1080963 - in /lucene/dev/branches/docvalues: ./ lucene/ lucene/src/java/org/apache/lucene/search/SortField.java solr/

[rm...@apache.org]

Author: rmuir
Date: Sat Mar 12 18:24:35 2011
New Revision: 1080963

URL: http://svn.apache.org/viewvc?rev=1080963&view=rev
Log:
merge r1079712,r1079716 from trunk to fix the docvalues hudson build

Modified:
    lucene/dev/branches/docvalues/   (props changed)
    lucene/dev/branches/docvalues/lucene/   (props changed)
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/SortField.java
    lucene/dev/branches/docvalues/solr/   (props changed)

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/SortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/SortField.java?rev=1080963&r1=1080962&r2=1080963&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/SortField.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/SortField.java Sat Mar 12 18:24:35 2011
@@ -101,7 +101,11 @@ public class SortField {
   private int type;  // defaults to determining type dynamically
   private Locale locale;    // defaults to "natural order" (no Locale)
   boolean reverse = false;  // defaults to natural order
-  private CachedArrayCreator<?> creator;
+  
+  // This is not generified because of a javac bug in early JDK 1.5 (e.g. used by FreeBSD).
+  // With <?> as type param, getComparator() fails to compile because of cast problems.
+  @SuppressWarnings("unchecked") private CachedArrayCreator creator;
+  
   public Object missingValue = null; // used for 'sortMissingFirst/Last'
 
   // Used for CUSTOM sort