Skip to content

VERACODE-992: fix of CWE ID 404 improper resource shutdown or release in FileLockExclusiveReadLockStrategy #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LeonidMarushevskyi wants to merge 1 commit into from
Closed

VERACODE-992: fix of CWE ID 404 improper resource shutdown or release in FileLockExclusiveReadLockStrategy #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion ...main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ public boolean acquireExclusiveReadLock(GenericFileOperations<File> operations,

LOG.trace("Waiting for exclusive read lock to file: {}", target);

FileChannel channel = null;
RandomAccessFile randomAccessFile = null;
try {
randomAccessFile = new RandomAccessFile(target, "rw");
// try to acquire rw lock on the file before we can consume it
FileChannel channel = new RandomAccessFile(target, "rw").getChannel();
channel = randomAccessFile.getChannel();

boolean exclusive = false;
StopWatch watch = new StopWatch();
Expand Down Expand Up @@ -113,6 +116,24 @@ public boolean acquireExclusiveReadLock(GenericFileOperations<File> operations,
// we were interrupted while sleeping, we are likely being shutdown so return false
return false;
}
} finally {
// Close channel
try {
if (channel != null) {
channel.close();
}
} catch (IOException ioe) {
LOG.warn("Unable to close channel for file " + file.getAbsoluteFilePath() + "!", ioe);
}

// Close file
try {
if (randomAccessFile != null) {
randomAccessFile.close();
}
} catch (IOException ioe) {
LOG.warn("Unable to close file " + file.getAbsoluteFilePath() + "!", ioe);
}
}

return true;
Expand Down