NIFI-8250 - This closes apache#4838. UTF8 encoding for FTP processors

Signed-off-by: Joe Witt <[email protected]>
davyam · Feb 23, 2021 · 9101160 · 9101160
1 parent 3cb26ae
commit 9101160
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...e/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java b/...e/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java
@@ -101,6 +101,7 @@ protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
         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/...andard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java b/...andard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
@@ -603,6 +603,7 @@ private FTPClient getClient(final FlowFile flowFile) throws IOException {
         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());