Updated Branches: refs/heads/flume-1.4 84ba0bd84 -> d1b9ca17c
FLUME-1511. Scribe-source doesn't handle zero message request correctly. (Denny Ye 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/d1b9ca17 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/d1b9ca17 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/d1b9ca17 Branch: refs/heads/flume-1.4 Commit: d1b9ca17c5062ddbedb8fcd355638ab9e9c47288 Parents: 84ba0bd Author: Mike Percy <[email protected]> Authored: Thu Mar 14 17:43:50 2013 -0700 Committer: Mike Percy <[email protected]> Committed: Thu Mar 14 17:43:50 2013 -0700 ---------------------------------------------------------------------- .../apache/flume/source/scribe/ScribeSource.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/d1b9ca17/flume-ng-sources/flume-scribe-source/src/main/java/org/apache/flume/source/scribe/ScribeSource.java ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-scribe-source/src/main/java/org/apache/flume/source/scribe/ScribeSource.java b/flume-ng-sources/flume-scribe-source/src/main/java/org/apache/flume/source/scribe/ScribeSource.java index e323c30..b3a8de3 100644 --- a/flume-ng-sources/flume-scribe-source/src/main/java/org/apache/flume/source/scribe/ScribeSource.java +++ b/flume-ng-sources/flume-scribe-source/src/main/java/org/apache/flume/source/scribe/ScribeSource.java @@ -141,7 +141,7 @@ public class ScribeSource extends AbstractSource implements class Receiver implements Iface { public ResultCode Log(List<LogEntry> list) throws TException { - if (list != null && list.size() > 0) { + if (list != null) { sourceCounter.addToEventReceivedCount(list.size()); try { @@ -155,7 +155,9 @@ public class ScribeSource extends AbstractSource implements events.add(event); } - getChannelProcessor().processEventBatch(events); + if (events.size() > 0) { + getChannelProcessor().processEventBatch(events); + } sourceCounter.addToEventAcceptedCount(list.size()); return ResultCode.OK;
