Updated Branches: refs/heads/trunk 246c1b021 -> 0b59252e7
FLUME-1569: MemoryChannel uses an Integer as a lock (Daisuke Kobayashi 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/0b59252e Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/0b59252e Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/0b59252e Branch: refs/heads/trunk Commit: 0b59252e772e5d82067cb694285f6bf7f9cf41a0 Parents: 246c1b0 Author: Brock Noland <[email protected]> Authored: Thu Oct 11 15:10:13 2012 -0500 Committer: Brock Noland <[email protected]> Committed: Thu Oct 11 15:10:13 2012 -0500 ---------------------------------------------------------------------- .../org/apache/flume/channel/MemoryChannel.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/0b59252e/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java b/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java index fc3a1e2..a656c8b 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java +++ b/flume-ng-core/src/main/java/org/apache/flume/channel/MemoryChannel.java @@ -166,7 +166,7 @@ public class MemoryChannel extends BasicChannelSemantics { // lock to guard queue, mainly needed to keep it locked down during resizes // it should never be held through a blocking operation - private Integer queueLock; + private Object queueLock = new Object(); @GuardedBy(value = "queueLock") private LinkedBlockingDeque<Event> queue; @@ -192,7 +192,6 @@ public class MemoryChannel extends BasicChannelSemantics { public MemoryChannel() { super(); - queueLock = 0; } /**
