(hop) branch main updated: initial arraylist to avoid NPE, fix UI field mismatches. fixes #7276 (#7282)

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new 6aad589666 initial arraylist to avoid NPE, fix UI field mismatches. 
fixes #7276 (#7282)
6aad589666 is described below

commit 6aad589666c8458216b8685bb749d2b6dbd1b2f0
Author: Bart Maertens <bart.maert...@know.bi>
AuthorDate: Fri Jun 12 12:44:48 2026 +0200

    initial arraylist to avoid NPE, fix UI field mismatches. fixes #7276 (#7282)
---
 .../workflow/actions/pgpencryptfiles/ActionPGPEncryptFiles.java   | 5 ++++-
 .../actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java      | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFiles.java
 
b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFiles.java
index eb8e886ee3..294ae8e5f5 100644
--- 
a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFiles.java
+++ 
b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFiles.java
@@ -218,7 +218,10 @@ public class ActionPGPEncryptFiles extends ActionBase 
implements Cloneable, IAct
     this.successConditionBroken = a.successConditionBroken;
     this.successConditionBrokenExit = a.successConditionBrokenExit;
     this.limitFiles = a.limitFiles;
-    a.pgpFiles.forEach(f -> this.pgpFiles.add(new PgpFile(f)));
+    this.pgpFiles = new ArrayList<>();
+    if (a.pgpFiles != null) {
+      a.pgpFiles.forEach(f -> this.pgpFiles.add(new PgpFile(f)));
+    }
   }
 
   @Override
diff --git 
a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java
 
b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java
index c6b818d5ce..2d31efd834 100644
--- 
a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java
+++ 
b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java
@@ -562,7 +562,7 @@ public class ActionPGPEncryptFilesDialog extends 
ActionDialog {
           @Override
           public void widgetSelected(SelectionEvent arg0) {
             wFields.add(
-                ActionPGPEncryptFiles.ActionType.SIGN.getDescription(),
+                ActionPGPEncryptFiles.ActionType.ENCRYPT.getDescription(),
                 wSourceFileFolder.getText(),
                 wWildcard.getText(),
                 null,
@@ -1640,9 +1640,9 @@ public class ActionPGPEncryptFilesDialog extends 
ActionDialog {
       pgpFile.setActionType(
           
ActionPGPEncryptFiles.ActionType.lookupWithDescription(item.getText(1)));
       pgpFile.setSourceFileFolder(item.getText(2));
-      pgpFile.setUserId(item.getText(3));
-      pgpFile.setDestinationFileFolder(item.getText(4));
-      pgpFile.setWildcard(item.getText(5));
+      pgpFile.setWildcard(item.getText(3));
+      pgpFile.setUserId(item.getText(4));
+      pgpFile.setDestinationFileFolder(item.getText(5));
     }
     dispose();
   }