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 fr...@apache.org on 2017/12/05 13:13:36 UTC
svn commit: r1817192 -
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
Author: frm
Date: Tue Dec 5 13:13:36 2017
New Revision: 1817192
URL: http://svn.apache.org/viewvc?rev=1817192&view=rev
Log:
OAK-7031 - Delete temporary files using Files#deleteIfExists
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java?rev=1817192&r1=1817191&r2=1817192&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/ResponseDecoder.java Tue Dec 5 13:13:36 2017
@@ -48,22 +48,23 @@ public class ResponseDecoder extends Byt
private static class DeleteOnCloseFileInputStream extends FileInputStream {
private static final Logger log = LoggerFactory.getLogger(DeleteOnCloseFileInputStream.class);
-
- private File file;
+
+ private final File file;
DeleteOnCloseFileInputStream(File file) throws FileNotFoundException {
super(file);
this.file = file;
}
+ @Override
public void close() throws IOException {
try {
super.close();
} finally {
- if (file != null) {
- log.debug("Processing input stream finished! Deleting file {}", file.getAbsolutePath());
- file.delete();
- file = null;
+ if (Files.deleteIfExists(file.toPath())) {
+ log.debug("File {} was deleted", file.getAbsolutePath());
+ } else {
+ log.debug("Could not delete {}, not found", file.getAbsoluteFile());
}
}
}