You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/05/02 16:43:51 UTC
[hop] branch master updated: [HOP-3228] refactored original fix as it set all variables as parameters
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new e0c77bc7fc [HOP-3228] refactored original fix as it set all variables as parameters
new 65b46e1cd3 Merge pull request #1474 from jballment/HOP-3228
e0c77bc7fc is described below
commit e0c77bc7fc872f435465c1ecc640e25b0185347f
Author: John Ballment <jo...@bizcubed.com.au>
AuthorDate: Mon May 2 17:19:26 2022 +1000
[HOP-3228] refactored original fix as it set all variables as parameters
---
.../workflow/engines/remote/RemoteWorkflowEngine.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java b/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java
index 7f917fe880..ed0a266309 100644
--- a/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java
+++ b/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java
@@ -244,16 +244,6 @@ public class RemoteWorkflowEngine extends Variables implements IWorkflowEngine<W
}
workflowExecutionConfiguration.setGatheringMetrics(gatheringMetrics);
- // Pass all variables to the parameters map...
- //
- Map<String, String> parametersMap = workflowExecutionConfiguration.getParametersMap();
- for (String variableName : this.getVariableNames()) {
- String variableValue = this.getVariable(variableName);
- if (variableName != null && variableValue != null) {
- parametersMap.put(variableName, variableValue);
- }
- }
-
sendToHopServer(this, workflowMeta, workflowExecutionConfiguration, metadataProvider);
fireWorkflowStartedListeners();
@@ -369,6 +359,14 @@ public class RemoteWorkflowEngine extends Variables implements IWorkflowEngine<W
}
}
+ // Add parameters to the execution configuration
+ //
+ Map<String, String> parametersMap = executionConfiguration.getParametersMap();
+ for (String param : listParameters()) {
+ parametersMap.put(param, getVariable(param));
+ }
+
+
if (remoteWorkflowRunConfiguration.isExportingResources()) {
// First export the workflow...
//