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/03/13 03:46:01 UTC

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

Author: rmuir
Date: Sun Mar 13 02:46:01 2011
New Revision: 1081034

URL: http://svn.apache.org/viewvc?rev=1081034&view=rev
Log:
revert hack

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=1081034&r1=1081033&r2=1081034&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 Sun Mar 13 02:46:01 2011
@@ -101,11 +101,7 @@ 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
-  
-  // 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;
-  
+  private CachedArrayCreator<?> creator;
   public Object missingValue = null; // used for 'sortMissingFirst/Last'
 
   // Used for CUSTOM sort