You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2013/03/15 01:46:30 UTC
git commit: FLUME-1511. Scribe-source doesn't handle zero message
request correctly.
Updated Branches:
refs/heads/trunk 4d0814630 -> 46dadc63e
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/46dadc63
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/46dadc63
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/46dadc63
Branch: refs/heads/trunk
Commit: 46dadc63e540bca52fe87557762506ed55cd5a3a
Parents: 4d08146
Author: Mike Percy <mp...@apache.org>
Authored: Thu Mar 14 17:43:50 2013 -0700
Committer: Mike Percy <mp...@apache.org>
Committed: Thu Mar 14 17:46:11 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/46dadc63/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;