You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/08/06 19:07:15 UTC
logging-log4j2 git commit: Use FileLock in a try-with-resources.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 6d416f9cb -> 1a49a34ee
Use FileLock in a try-with-resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1a49a34e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1a49a34e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1a49a34e
Branch: refs/heads/master
Commit: 1a49a34ee62bd1ff2cd2d757a2fa578594569a9d
Parents: 6d416f9
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Aug 6 12:07:05 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Aug 6 12:07:05 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/FileManager.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1a49a34e/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index 3bb4f6c..542edbf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -98,11 +98,8 @@ public class FileManager extends OutputStreamManager {
file is already locked by another FileChannel in the same JVM. Hopefully, that will
be avoided since every file should have a single file manager - unless two different
files strings are configured that somehow map to the same file.*/
- final FileLock lock = channel.lock(0, Long.MAX_VALUE, false);
- try {
+ try (final FileLock lock = channel.lock(0, Long.MAX_VALUE, false)) {
super.write(bytes, offset, length, immediateFlush);
- } finally {
- lock.release();
}
} catch (final IOException ex) {
throw new AppenderLoggingException("Unable to obtain lock on " + getName(), ex);