lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r833298 - in /lucene/java/branches/lucene_2_9: ./ src/java/org/apache/lucene/search/SortField.java src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
Date Fri, 06 Nov 2009 04:32:24 GMT
Author: uschindler
Date: Fri Nov  6 04:32:24 2009
New Revision: 833298

URL: http://svn.apache.org/viewvc?rev=833298&view=rev
Log:
Fix the heavy committing error :(

Modified:
    lucene/java/branches/lucene_2_9/   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/SortField.java
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
  (props changed)

Propchange: lucene/java/branches/lucene_2_9/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  6 04:32:24 2009
@@ -1,2 +1,2 @@
 /lucene/java/branches/lucene_2_4:748824
-/lucene/java/trunk:824125,826029,826385,830871,833095
+/lucene/java/trunk:824125,826029,826385,830871,833095,833297

Modified: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/SortField.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/SortField.java?rev=833298&r1=833297&r2=833298&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/SortField.java (original)
+++ lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/SortField.java Fri Nov
 6 04:32:24 2009
@@ -446,7 +446,8 @@
   // field must be interned after reading from stream
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
     in.defaultReadObject();
-    field = StringHelper.intern(field);
+    if (field != null)
+      field = StringHelper.intern(field);
   }
 
   /** Returns the {@link FieldComparator} to use for

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  6 04:32:24 2009
@@ -1,2 +1,2 @@
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:748824
-/lucene/java/trunk/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:818920,824125,826029,826385,830871,833095
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:818920,824125,826029,826385,830871,833095,833297



Mime
View raw message