You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2019/12/08 13:31:25 UTC

[commons-compress] 03/04: Merge branch 'PeterAlfreadLee-COMPRESS_477'

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

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git

commit 992ecf3c0a70ab1646d3689b9ac60844a5d603cf
Merge: 28049d2 b507be8
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sun Dec 8 13:30:22 2019 +0100

    Merge branch 'PeterAlfreadLee-COMPRESS_477'

 .../compress/archivers/zip/ZipArchiveEntry.java    |    9 +
 .../archivers/zip/ZipArchiveInputStream.java       |   34 +-
 .../commons/compress/archivers/zip/ZipFile.java    |  167 +-
 .../zip/ZipSplitReadOnlySeekableByteChannel.java   |  226 ++
 .../commons/compress/compressors/FileNameUtil.java |   29 +
 .../utils/MultiReadOnlySeekableByteChannel.java    |   19 +-
 .../archivers/zip/ZipArchiveInputStreamTest.java   |   72 +
 .../compress/archivers/zip/ZipFileTest.java        |   83 +
 .../MultiReadOnlySeekableByteChannelTest.java      |    8 +-
 .../ZipSplitReadOnlySeekableByteChannelTest.java   |  181 ++
 .../split_zip_created_by_winrar/file_to_compare_1} | 2594 ++++++++++----------
 .../split_zip_created_by_winrar.z01                |  Bin 0 -> 262144 bytes
 .../split_zip_created_by_winrar.z02                |  Bin 0 -> 262144 bytes
 .../split_zip_created_by_winrar.zip                |  Bin 0 -> 50536 bytes
 .../zip_to_compare_created_by_winrar.zip           |  Bin 0 -> 574820 bytes
 .../split_zip_created_by_zip/file_to_compare_1     |   38 +
 .../split_zip_created_by_zip/file_to_compare_2     |   79 +
 .../split_zip_created_by_zip.z01                   |  Bin 0 -> 262144 bytes
 .../split_zip_created_by_zip.z02                   |  Bin 0 -> 262144 bytes
 .../split_zip_created_by_zip.zip                   |  Bin 0 -> 57763 bytes
 .../split_zip_created_by_zip_zip64.z01             |  Bin 0 -> 262144 bytes
 .../split_zip_created_by_zip_zip64.z02             |  Bin 0 -> 262144 bytes
 .../split_zip_created_by_zip_zip64.zip             |  Bin 0 -> 69177 bytes
 .../zip_to_compare_created_by_zip.zip              |  Bin 0 -> 582047 bytes
 .../zip_to_compare_created_by_zip_zip64.zip        |  Bin 0 -> 584681 bytes
 25 files changed, 2209 insertions(+), 1330 deletions(-)