Repository: nifi Updated Branches: refs/heads/NIFI-631 [created] ec9b53b6a
NIFI-1208 Adding context.yield() to Listen and Put syslog when there is nothing to do in onTrigger() Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9600461b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9600461b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9600461b Branch: refs/heads/NIFI-631 Commit: 9600461b00f7e4e2e8ab4a5b1fff884d9f33d5ba Parents: 4e2c94d Author: Bryan Bende <[email protected]> Authored: Mon Nov 23 10:30:33 2015 -0500 Committer: Tony Kurc <[email protected]> Committed: Tue Nov 24 20:55:18 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/processors/standard/ListenSyslog.java | 3 ++- .../main/java/org/apache/nifi/processors/standard/PutSyslog.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/9600461b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java index 1660e3a..effaffc 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java @@ -238,8 +238,9 @@ public class ListenSyslog extends AbstractSyslogProcessor { initialEvent = syslogEvents.poll(); } - // if nothing in either queue then just return + // if nothing in either queue then yield and return if (initialEvent == null) { + context.yield(); return; } http://git-wip-us.apache.org/repos/asf/nifi/blob/9600461b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java index 27f2938..733c113 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java @@ -260,6 +260,7 @@ public class PutSyslog extends AbstractSyslogProcessor { final List<FlowFile> flowFiles = session.get(batchSize); if (flowFiles == null || flowFiles.isEmpty()) { pruneIdleSenders(context.getProperty(IDLE_EXPIRATION).asTimePeriod(TimeUnit.MILLISECONDS).longValue()); + context.yield(); return; }
