Repository: nifi Updated Branches: refs/heads/master 33ef59c5b -> 0900fb80c
NIFI-1153: If no incoming FlowFile, don't try to transfer null Reviewed by Bryan Bende ([email protected]) Amended based on review (change to a log message) by Tony Kurc ([email protected]) Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0900fb80 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0900fb80 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0900fb80 Branch: refs/heads/master Commit: 0900fb80c9deaf96d17c72683b9b4886b44d6180 Parents: 33ef59c Author: Mark Payne <[email protected]> Authored: Thu Nov 12 22:41:57 2015 -0500 Committer: Tony Kurc <[email protected]> Committed: Thu Nov 12 22:41:57 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/processors/standard/ExecuteSQL.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0900fb80/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java index eed6eb2..452df42 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQL.java @@ -168,8 +168,12 @@ public class ExecuteSQL extends AbstractProcessor { session.getProvenanceReporter().modifyContent(outgoing, "Retrieved " + nrOfRows.get() + " rows", stopWatch.getElapsed(TimeUnit.MILLISECONDS)); session.transfer(outgoing, REL_SUCCESS); } catch (final ProcessException | SQLException e) { - logger.error("Unable to execute SQL select query {} for {} due to {}; routing to failure", new Object[] { selectQuery, incoming, e }); - session.transfer(incoming, REL_FAILURE); + if (incoming == null) { + logger.error("Unable to execute SQL select query {} due to {}. No incoming flow file to route to failure", new Object[] {selectQuery, e}); + } else { + logger.error("Unable to execute SQL select query {} for {} due to {}; routing to failure", new Object[] {selectQuery, incoming, e}); + session.transfer(incoming, REL_FAILURE); + } } } }
