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

https://issues.apache.org/jira/browse/AMQ-6445 

Fixing RandomAccessFile usage so that the file will be properly closed
even if there is an exception
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-09-29 06:16:40 -04:00
parent 0dd806f43f
commit 351faf2699
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
View File

@ -374,10 +374,8 @@ public class Journal {
} }
private void doPreallocationKernelCopy(RecoverableRandomAccessFile file) { private void doPreallocationKernelCopy(RecoverableRandomAccessFile file) {
try { try (RandomAccessFile templateRaf = new RandomAccessFile(osKernelCopyTemplateFile, "rw");){
RandomAccessFile templateRaf = new RandomAccessFile(osKernelCopyTemplateFile, "rw");
templateRaf.getChannel().transferTo(0, getMaxFileLength(), file.getChannel()); templateRaf.getChannel().transferTo(0, getMaxFileLength(), file.getChannel());
templateRaf.close();
} catch (ClosedByInterruptException ignored) { } catch (ClosedByInterruptException ignored) {
LOG.trace("Could not preallocate journal file with kernel copy", ignored); LOG.trace("Could not preallocate journal file with kernel copy", ignored);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {

10
activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/util/DiskBenchmark.java
View File

@ -300,11 +300,11 @@ public class DiskBenchmark {
if (tmpFile.exists()) { if (tmpFile.exists()) {
tmpFile.delete(); tmpFile.delete();
} }
RandomAccessFile templateFile = new RandomAccessFile(tmpFile, "rw"); try (RandomAccessFile templateFile = new RandomAccessFile(tmpFile, "rw");) {
templateFile.setLength(size); templateFile.setLength(size);
templateFile.getChannel().force(true); templateFile.getChannel().force(true);
templateFile.getChannel().transferTo(0, size, raf.getChannel()); templateFile.getChannel().transferTo(0, size, raf.getChannel());
templateFile.close(); }
tmpFile.delete(); tmpFile.delete();
} }