Updated Branches: refs/heads/flume-1.4 7cd07a648 -> bb38f0ff0
FLUME-1993. Fix spooldir tracker file sharing violation on Windows. (Paul Chavez and Phil Scala via Mike Percy) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/bb38f0ff Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/bb38f0ff Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/bb38f0ff Branch: refs/heads/flume-1.4 Commit: bb38f0ff096f56594c613c8e3449a4ffd55314fc Parents: 7cd07a6 Author: Mike Percy <[email protected]> Authored: Thu Apr 18 15:46:30 2013 -0700 Committer: Mike Percy <[email protected]> Committed: Thu Apr 18 15:46:30 2013 -0700 ---------------------------------------------------------------------- .../avro/ReliableSpoolingFileEventReader.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/bb38f0ff/flume-ng-core/src/main/java/org/apache/flume/client/avro/ReliableSpoolingFileEventReader.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/main/java/org/apache/flume/client/avro/ReliableSpoolingFileEventReader.java b/flume-ng-core/src/main/java/org/apache/flume/client/avro/ReliableSpoolingFileEventReader.java index 37f0ee1..f82fe1f 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/client/avro/ReliableSpoolingFileEventReader.java +++ b/flume-ng-core/src/main/java/org/apache/flume/client/avro/ReliableSpoolingFileEventReader.java @@ -419,8 +419,8 @@ public class ReliableSpoolingFileEventReader implements ReliableEventReader { if (!tracker.getTarget().equals(nextPath)) { tracker.close(); deleteMetaFile(); + tracker = DurablePositionTracker.getInstance(metaFile, nextPath); } - tracker = DurablePositionTracker.getInstance(metaFile, nextPath); // sanity check Preconditions.checkState(tracker.getTarget().equals(nextPath),
