You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2022/01/12 08:17:35 UTC
[hop] branch master updated: HOP-3591 ActionWorkflow: input filenames result collection is empty
This is an automated email from the ASF dual-hosted git repository.
mcasters 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 6630ac3 HOP-3591 ActionWorkflow: input filenames result collection is empty
new dc4d678 Merge pull request #1270 from sramazzina/HOP-3591
6630ac3 is described below
commit 6630ac3b25b7dab1fe083edca0494f383e921f39
Author: Sergio Ramazzina <se...@serasoft.it>
AuthorDate: Tue Jan 11 01:00:46 2022 +0100
HOP-3591 ActionWorkflow: input filenames result collection is empty
---
engine/src/main/java/org/apache/hop/workflow/Workflow.java | 10 +++++++++-
.../addresultfilenames/messages/messages_en_US.properties | 4 ++--
.../copymoveresultfilenames/messages/messages_en_US.properties | 2 +-
.../deleteresultfilenames/messages/messages_en_US.properties | 4 ++--
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/workflow/Workflow.java b/engine/src/main/java/org/apache/hop/workflow/Workflow.java
index 1e454d8..65e9c67 100644
--- a/engine/src/main/java/org/apache/hop/workflow/Workflow.java
+++ b/engine/src/main/java/org/apache/hop/workflow/Workflow.java
@@ -386,7 +386,15 @@ public abstract class Workflow extends Variables
//
boolean isFirst = true;
- Result inputRes = new Result();
+
+ // Use a result obj coming from input otherwise init an empty Result object
+ Result inputRes = null;
+ if (result != null) {
+ inputRes = result;
+ } else {
+ inputRes = new Result();
+ }
+
// Perhaps there is already a list of input rows available?
if (getSourceRows() != null) {
inputRes.setRows(getSourceRows());
diff --git a/plugins/actions/addresultfilenames/src/main/resources/org/apache/hop/workflow/actions/addresultfilenames/messages/messages_en_US.properties b/plugins/actions/addresultfilenames/src/main/resources/org/apache/hop/workflow/actions/addresultfilenames/messages/messages_en_US.properties
index 70c05f1..bdea982 100644
--- a/plugins/actions/addresultfilenames/src/main/resources/org/apache/hop/workflow/actions/addresultfilenames/messages/messages_en_US.properties
+++ b/plugins/actions/addresultfilenames/src/main/resources/org/apache/hop/workflow/actions/addresultfilenames/messages/messages_en_US.properties
@@ -36,7 +36,7 @@ ActionAddResultFilenames.FilenameEdit.Tooltip=Edit selected files
ActionCopyMoveResultFilenames.AddedFileToResult=Add filename to result filenames
ActionAddResultFilenames.IncludeSubfolders.Label=Include Subfolders?
ActionAddResultFilenames.FilenameAdd.Button=&Add
-ActionAddResultFilenames.DeleteAllBefore.Tooltip=Clear resultfilenames before adding filenames
+ActionAddResultFilenames.DeleteAllBefore.Tooltip=Clear result filenames before adding filenames
ActionAddResultFilenames.BrowseFiles.Label=File...
ActionAddResultFilenames.FilenameDelete.Tooltip=Remove selected files from the grid
ActionAddResultFilenames.Name.Default=Add result filenames
@@ -49,7 +49,7 @@ ActionAddResultFilenames.Previous.Tooltip=Check this to pass the results of the
ActionAddResultFilenames.Title=Add filenames to result
ActionAddResultFilenames.Error.Exception.DeleteProcessError=Error
ActionAddResultFilenames.Previous.Label=Copy previous results to args?
-ActionAddResultFilenames.DeleteAllBefore.Label=Clear resultfilenames?
+ActionAddResultFilenames.DeleteAllBefore.Label=Clear result filenames?
ActionAddResultFilenames.FilenameEdit.Button=&Edit
ActionAddResultFilenames.FilenameDelete.Button=&Delete
ActionAddResultFilenames.Fields.Wildcard.Label=Wildcard (RegExp)
diff --git a/plugins/actions/copymoveresultfilenames/src/main/resources/org/apache/hop/workflow/actions/copymoveresultfilenames/messages/messages_en_US.properties b/plugins/actions/copymoveresultfilenames/src/main/resources/org/apache/hop/workflow/actions/copymoveresultfilenames/messages/messages_en_US.properties
index 3b37400..4e49e24 100644
--- a/plugins/actions/copymoveresultfilenames/src/main/resources/org/apache/hop/workflow/actions/copymoveresultfilenames/messages/messages_en_US.properties
+++ b/plugins/actions/copymoveresultfilenames/src/main/resources/org/apache/hop/workflow/actions/copymoveresultfilenames/messages/messages_en_US.properties
@@ -28,7 +28,7 @@ ActionCopyMoveResultFilenames.log.MovedFile={0} was moved to {1}
ActionCopyMoveResultFilenames.Error=Error \: {0}
ActionCopyMoveResultFilenames.AddDate.Tooltip=Add date to filename
ActionCopyMoveResultFilenames.Log.FolderExists=Folder [{0}] exists.
-ActionCopyMoveResultFilenames.CanNotLoadFromXML=Unable to load action of type 'copy move resultfilenames' from XML node
+ActionCopyMoveResultFilenames.CanNotLoadFromXML=Unable to load action of type 'copy move result filenames' from XML node
ActionCopyMoveResultFilenames.Name.Default=Copy Move Result Filenames
ActionCopyMoveResultFilenames.Delete.Label=Delete
ActionCopyMoveResultFilenames.Title=Process result filenames
diff --git a/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties b/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties
index 6bfcf9f..c5c01e9 100644
--- a/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties
+++ b/plugins/actions/deleteresultfilenames/src/main/resources/org/apache/hop/workflow/actions/deleteresultfilenames/messages/messages_en_US.properties
@@ -32,6 +32,6 @@ ActionDeleteResultFilenames.log.FilesFound={0} file(s) found from result filenam
ActionDeleteResultFilenames.log.DeletedFiles={0} filename(s) was/were deleted found result filenames
ActionDeleteResultFilenames.log.DeletedFile={0} was removed from result filenames
ActionDeleteResultFilenames.Error=Error : {0}
-ActionDeleteResultFilenames.CanNotLoadFromXML=Unable to load action of type 'delete resultfilenames' from XML node
-ActionDeleteResultFilenames.CanNotSaveToRep=Unable to save action of type 'delete resultfilenames' to the repository for id_job={0}, {1}
+ActionDeleteResultFilenames.CanNotLoadFromXML=Unable to load action of type 'delete result filenames' from XML node
+ActionDeleteResultFilenames.CanNotSaveToRep=Unable to save action of type 'delete result filenames' to the repository for id_job={0}, {1}
ActionDeleteResultFilenames.keyword=delete,result,filenames
\ No newline at end of file