You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/02/17 23:50:55 UTC

nifi git commit: NIFI-1514 Fixed ExecuteStreamCommand when expressions in command arguments are used, contents are not split by command separator

Repository: nifi
Updated Branches:
  refs/heads/master 6c2ba997a -> c2998a71e


NIFI-1514 Fixed ExecuteStreamCommand when expressions in command arguments are used, contents are not split by command separator

This closes #223.

Signed-off-by: Aldrin Piri <al...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c2998a71
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c2998a71
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c2998a71

Branch: refs/heads/master
Commit: c2998a71ec4e262363858e7d54bb2e47afcda8c2
Parents: 6c2ba99
Author: Michal Klempa <mi...@gmail.com>
Authored: Mon Feb 15 21:38:26 2016 +0100
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed Feb 17 17:48:23 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/c2998a71/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();