[nifi] branch main updated: NIFI-8250 - This closes #4838. UTF8 encoding for FTP processors

[joewitt]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 9101160  NIFI-8250 - This closes #4838. UTF8 encoding for FTP 
processors
9101160 is described below

commit 9101160cbfbc8bf39c2d781522ee6919fbd0c7ec
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Tue Feb 23 16:35:15 2021 +0400

    NIFI-8250 - This closes #4838. UTF8 encoding for FTP processors
    
    Signed-off-by: Joe Witt <joew...@apache.org>
---
 .../src/main/java/org/apache/nifi/processors/standard/ListFTP.java       | 1 +
 .../main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java
index e2e7b1e..ad9601e 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java
@@ -101,6 +101,7 @@ public class ListFTP extends ListFileTransfer {
         properties.add(ListedEntityTracker.TRACKING_STATE_CACHE);
         properties.add(ListedEntityTracker.TRACKING_TIME_WINDOW);
         properties.add(ListedEntityTracker.INITIAL_LISTING_TARGET);
+        properties.add(FTPTransfer.UTF8_ENCODING);
         return properties;
     }
 
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 7d85b87..b7ac6a9 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
@@ -603,6 +603,7 @@ public class FTPTransfer implements FileTransfer {
         final boolean useUtf8Encoding = ctx.getProperty(UTF8_ENCODING).isSet() 
? ctx.getProperty(UTF8_ENCODING).asBoolean() : false;
         if (useUtf8Encoding) {
             client.setControlEncoding("UTF-8");
+            client.setAutodetectUTF8(useUtf8Encoding);
         }
 
         client.connect(inetAddress, 
ctx.getProperty(PORT).evaluateAttributeExpressions(flowFile).asInteger());