(nifi) branch support/nifi-1.x updated: NIFI-12895 Added Timeout property to GetSmbFile and PutSmbFile

[pvillard]

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

pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new cc81eeffb2 NIFI-12895 Added Timeout property to GetSmbFile and 
PutSmbFile
cc81eeffb2 is described below

commit cc81eeffb21604059b32a0cb80992d3b5d6fe941
Author: Peter Turcsanyi <turcsa...@apache.org>
AuthorDate: Sat Mar 23 18:58:52 2024 +0100

    NIFI-12895 Added Timeout property to GetSmbFile and PutSmbFile
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #8551.
---
 .../src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java        | 2 ++
 .../src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java        | 2 ++
 2 files changed, 4 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
 
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
index 244ae4639f..ed843f9bff 100644
--- 
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
+++ 
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
@@ -81,6 +81,7 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
 import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
+import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
 import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
 import static org.apache.nifi.smb.common.SmbUtils.buildSmbClient;
 
@@ -256,6 +257,7 @@ public class GetSmbFile extends AbstractProcessor {
         descriptors.add(IGNORE_HIDDEN_FILES);
         descriptors.add(SMB_DIALECT);
         descriptors.add(USE_ENCRYPTION);
+        descriptors.add(TIMEOUT);
         this.descriptors = Collections.unmodifiableList(descriptors);
 
         final Set<Relationship> relationships = new HashSet<Relationship>();
diff --git 
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
 
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
index b7ee444ab9..468828f819 100644
--- 
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
+++ 
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
@@ -65,6 +65,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
+import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
 import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
 import static org.apache.nifi.smb.common.SmbUtils.buildSmbClient;
 
@@ -193,6 +194,7 @@ public class PutSmbFile extends AbstractProcessor {
         descriptors.add(RENAME_SUFFIX);
         descriptors.add(SMB_DIALECT);
         descriptors.add(USE_ENCRYPTION);
+        descriptors.add(TIMEOUT);
         this.descriptors = Collections.unmodifiableList(descriptors);
 
         final Set<Relationship> relationships = new HashSet<Relationship>();