joewitt commented on code in PR #8350:
URL: https://github.com/apache/nifi/pull/8350#discussion_r1476455470
##########
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java:
##########
@@ -473,24 +495,28 @@ protected void processEntry(final InputStream
zipInputStream, final boolean dire
private static class CompressedZipInputStreamCallback extends
ZipInputStreamCallback {
private final boolean allowStoredEntriesWithDataDescriptor;
+ private final Charset filenameEncoding;
private CompressedZipInputStreamCallback(
final Pattern fileFilter,
final ProcessSession session,
final FlowFile sourceFlowFile,
final List<FlowFile> unpacked,
final String fragmentId,
- final boolean allowStoredEntriesWithDataDescriptor
+ final boolean allowStoredEntriesWithDataDescriptor,
+ final Charset filenameEncoding
) {
super(fileFilter, session, sourceFlowFile, unpacked,
fragmentId);
this.allowStoredEntriesWithDataDescriptor =
allowStoredEntriesWithDataDescriptor;
+ this.filenameEncoding = filenameEncoding;
}
@Override
public void process(final InputStream inputStream) throws
IOException {
- try (final ZipArchiveInputStream zipInputStream = new
ZipArchiveInputStream(new BufferedInputStream(inputStream), null, true,
allowStoredEntriesWithDataDescriptor)) {
+ try (final ZipArchiveInputStream zipInputStream = new
ZipArchiveInputStream(new BufferedInputStream(inputStream),
+ filenameEncoding.toString(), true,
allowStoredEntriesWithDataDescriptor)) {
ZipArchiveEntry zipEntry;
- while ((zipEntry = zipInputStream.getNextZipEntry()) !=
null) {
+ while ((zipEntry = zipInputStream.getNextEntry()) != null)
{
Review Comment:
Same ask as in the tar case. Why change the method call here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
