You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2017/12/08 06:30:28 UTC
svn commit: r1817458 -
/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
Author: amitj
Date: Fri Dec 8 06:30:28 2017
New Revision: 1817458
URL: http://svn.apache.org/viewvc?rev=1817458&view=rev
Log:
OAK-7038: Make deletion of temp files resilient in some common utility methods
Closing input readers as well causing windows failure
Modified:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
Modified: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java?rev=1817458&r1=1817457&r2=1817458&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java Fri Dec 8 06:30:28 2017
@@ -506,6 +506,11 @@ public class ExternalSort {
int rowcounter = merge(fbw, cmp, distinct, bfbs, typeToString);
return rowcounter;
} finally {
+ for (BinaryFileBuffer buffer : bfbs) {
+ try {
+ buffer.close();
+ } catch (Exception e) {}
+ }
for (File f : files) {
f.delete();
}