Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10678 MiNiFi: Use defaultCharset for reading files in DebugOperationHandler 

This closes #6564

Signed-off-by: Ferenc Erdei <erdei.ferenc90@gmail.com>
This commit is contained in:
Ferenc Kis 2022-10-21 13:50:25 +02:00 committed by Ferenc Erdei
parent c50e677ee3
commit 91e267e6e3
No known key found for this signature in database
GPG Key ID: 023D856C60E92F96
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/DebugOperationHandler.java
View File

@ -34,6 +34,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@ -156,12 +157,13 @@ public class DebugOperationHandler implements C2OperationHandler {
List<Path> contentFilteredFilePaths = new ArrayList<>();
for (Path path : bundleFilePaths) {
String fileName = path.getFileName().toString();
try (Stream<String> fileStream = lines(path)) {
try (Stream<String> fileStream = lines(path, Charset.defaultCharset())) {
Path tempDirectory = createTempDirectory(operationId);
Path tempFile = Paths.get(tempDirectory.toAbsolutePath().toString(), fileName);
Files.write(tempFile, (Iterable<String>) fileStream.filter(contentFilter)::iterator);
contentFilteredFilePaths.add(tempFile);
} catch (IOException e) {
LOG.error("Error during filtering file content: " + path.toAbsolutePath(), e);
throw new UncheckedIOException(e);
}
}