Repository: nifi Updated Branches: refs/heads/support/nifi-0.5.x 280714942 -> 2a459fe21
NIFI-1514 Fixed ExecuteStreamCommand when expressions in command arguments are used, contents are not split by command separator Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8a074c37 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8a074c37 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8a074c37 Branch: refs/heads/support/nifi-0.5.x Commit: 8a074c3777213e38ba622f032bf8d277e1586828 Parents: 2807149 Author: Michal Klempa <[email protected]> Authored: Mon Feb 15 21:38:26 2016 +0100 Committer: Tony Kurc <[email protected]> Committed: Mon Feb 22 21:54:10 2016 -0500 ---------------------------------------------------------------------- .../apache/nifi/processors/standard/ExecuteStreamCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/8a074c37/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java index 38c8bd4..44a03b9 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java @@ -299,11 +299,11 @@ public class ExecuteStreamCommand extends AbstractProcessor { final String executeCommand = context.getProperty(EXECUTION_COMMAND).evaluateAttributeExpressions(inputFlowFile).getValue(); args.add(executeCommand); - final String commandArguments = context.getProperty(EXECUTION_ARGUMENTS).getValue(); + final String commandArguments = context.getProperty(EXECUTION_ARGUMENTS).evaluateAttributeExpressions(inputFlowFile).getValue(); final boolean ignoreStdin = Boolean.parseBoolean(context.getProperty(IGNORE_STDIN).getValue()); if (!StringUtils.isBlank(commandArguments)) { for (String arg : ArgumentUtils.splitArgs(commandArguments, context.getProperty(ARG_DELIMITER).getValue().charAt(0))) { - args.add(context.newPropertyValue(arg).evaluateAttributeExpressions(inputFlowFile).getValue()); + args.add(arg); } } final String workingDir = context.getProperty(WORKING_DIR).evaluateAttributeExpressions(inputFlowFile).getValue();
