Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1466: Fix File descriptor leak in SnapPuller 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@819313 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2009-09-27 13:54:37 +00:00
parent 2449e47a26
commit 94df351b87
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/solr/handler/SnapPuller.java
View File

@ -832,6 +832,8 @@ public class SnapPuller {
long bytesDownloaded = 0;
FileChannel fileChannel;
private FileOutputStream fileOutputStream;
byte[] buf = new byte[1024 * 1024];
@ -850,7 +852,7 @@ public class SnapPuller {
private Long indexVersion;
FileFetcher(File dir, Map<String, Object> fileDetails, String saveAs,
boolean isConf, long latestVersion) throws FileNotFoundException {
boolean isConf, long latestVersion) throws IOException {
this.copy2Dir = dir;
this.fileName = (String) fileDetails.get(NAME);
this.size = (Long) fileDetails.get(SIZE);
@ -862,7 +864,10 @@ public class SnapPuller {
indexVersion = latestVersion;
this.file = new File(copy2Dir, saveAs);
this.fileChannel = new FileOutputStream(file).getChannel();
this.fileOutputStream = new FileOutputStream(file);
this.fileChannel = this.fileOutputStream.getChannel();
if (includeChecksum)
checksum = new Adler32();
}
@ -992,8 +997,8 @@ public class SnapPuller {
*/
private void cleanup() {
try {
//close the file
fileChannel.close();
//close the FileOutputStream (which also closes the Channel)
fileOutputStream.close();
} catch (Exception e) {/* noop */
LOG.error("Error closing the file stream: "+ this.saveAs ,e);
}