svn commit: r1359948 - in /lucene/dev/branches/lucene_solr_3_6/lucene/contrib: CHANGES.txt spellchecker/ spellchecker/src/java/org/apache/lucene/search/suggest/fst/Sort.java

[rm...@apache.org]

Author: rmuir
Date: Tue Jul 10 23:11:13 2012
New Revision: 1359948

URL: http://svn.apache.org/viewvc?rev=1359948&view=rev
Log:
LUCENE-4209: fix another suggester leak: dont leave behind the file when rename fails (/tmp is its own filesystem)

Modified:
    lucene/dev/branches/lucene_solr_3_6/lucene/contrib/CHANGES.txt
    lucene/dev/branches/lucene_solr_3_6/lucene/contrib/spellchecker/   (props changed)
    lucene/dev/branches/lucene_solr_3_6/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/suggest/fst/Sort.java

Modified: lucene/dev/branches/lucene_solr_3_6/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/contrib/CHANGES.txt?rev=1359948&r1=1359947&r2=1359948&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/contrib/CHANGES.txt Tue Jul 10 23:11:13 2012
@@ -39,7 +39,8 @@ Bug Fixes
 
  * LUCENE-4209: Fix FSTCompletionLookup to close its sorter, so that it won't
    leave temp files behind in /tmp. Fix SortedTermFreqIteratorWrapper to not
-   leave temp files behind in /tmp on Windows.  (Uwe Schindler, Robert Muir)
+   leave temp files behind in /tmp on Windows. Fix Sort to not leave
+   temp files behind when /tmp is a separate volume. (Uwe Schindler, Robert Muir)
 
 Tests
  

Modified: lucene/dev/branches/lucene_solr_3_6/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/suggest/fst/Sort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/suggest/fst/Sort.java?rev=1359948&r1=1359947&r2=1359948&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/suggest/fst/Sort.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/suggest/fst/Sort.java Tue Jul 10 23:11:13 2012
@@ -224,10 +224,12 @@ public final class Sort {
 
     // One partition, try to rename or copy if unsuccessful.
     if (merges.size() == 1) {     
+      File single = merges.get(0);
       // If simple rename doesn't work this means the output is
       // on a different volume or something. Copy the input then.
-      if (!merges.get(0).renameTo(output)) {
-        copy(merges.get(0), output);
+      if (!single.renameTo(output)) {
+        copy(single, output);
+        single.delete();
       }
     } else { 
       // otherwise merge the partitions with a priority queue.