Updated Branches: refs/heads/trunk 41ca44be5 -> 6662b34c0
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/6662b34c Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/6662b34c Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/6662b34c Branch: refs/heads/trunk Commit: 6662b34c03511be65cdad8ead04860f7b0ab5fa6 Parents: 41ca44b Author: Mike Percy <[email protected]> Authored: Thu Apr 18 15:46:30 2013 -0700 Committer: Mike Percy <[email protected]> Committed: Thu Apr 18 15:47:36 2013 -0700 ---------------------------------------------------------------------- .../avro/ReliableSpoolingFileEventReader.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/6662b34c/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),
