Updated Branches: refs/heads/trunk 5289ccc56 -> 0dba90a42
FLUME-1513: File Channel log close() method should not be synchronized (Hari Shreedharan via Brock Noland) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/0dba90a4 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/0dba90a4 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/0dba90a4 Branch: refs/heads/trunk Commit: 0dba90a42b8eb672d58e862fad8c498f71831717 Parents: 5289ccc Author: Brock Noland <[email protected]> Authored: Mon Aug 27 13:50:27 2012 -0500 Committer: Brock Noland <[email protected]> Committed: Mon Aug 27 13:50:27 2012 -0500 ---------------------------------------------------------------------- .../java/org/apache/flume/channel/file/Log.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/0dba90a4/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java index 5b39b57..b8f6570 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Log.java @@ -493,10 +493,10 @@ class Log { } /** - * Synchronization required since we do not want this - * to be called during a checkpoint. + * Synchronization not required since this method gets the write lock, + * so checkpoint and this method cannot run at the same time. */ - synchronized void close() { + void close() { lockExclusive(); try { open = false;
