Repository: nifi Updated Branches: refs/heads/master 4e2c94d65 -> 4281a51c8
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/3ffb4559 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3ffb4559 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3ffb4559 Branch: refs/heads/master Commit: 3ffb455903745e06e06a3c9f1854cdde243ebfd8 Parents: b74617b Author: Bryan Bende <[email protected]> Authored: Mon Nov 23 10:30:33 2015 -0500 Committer: Bryan Bende <[email protected]> Committed: Mon Nov 23 10:30:33 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/3ffb4559/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/3ffb4559/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; }
