[nifi] branch support/nifi-1.x updated: NIFI-11472 Check working directory after making directory in PutFTP

[exceptionfactory]

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

exceptionfactory 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 07e6df896e NIFI-11472 Check working directory after making directory 
in PutFTP
07e6df896e is described below

commit 07e6df896eaa4867dddc06b2eb8f82dd53e9f6c6
Author: Daniel Aaron Salwerowicz <daniel.salwerow...@nb.no>
AuthorDate: Thu Apr 20 11:47:37 2023 +0200

    NIFI-11472 Check working directory after making directory in PutFTP
    
    - Multiple threads can attempt to create a remote directory when PutFTP has 
multiple concurrent tasks.
    
    This closes #7184
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
    (cherry picked from commit d3f2bf1c16346d0fb0b56eb228a723b7b32afa65)
---
 .../main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
index 031ad36686..1cd28227d5 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
@@ -395,7 +395,7 @@ public class FTPTransfer implements FileTransfer {
         if (!cdSuccessful) {
             if (client.makeDirectory(remoteDirectory)) {
                 logger.debug("Remote Directory not found: created directory 
[{}]", remoteDirectory);
-            } else {
+            } else if (!setWorkingDirectory(remoteDirectory)) { // Double 
check that the dir exists as it might have been created in another thread
                 throw new IOException("Failed to create remote directory " + 
remoteDirectory);
             }
         }