Merge branch 'COMPRESS-382' closes #20
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/5def510d Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/5def510d Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/5def510d Branch: refs/heads/master Commit: 5def510d00f73b25db8ce44303df49050f99dfbc Parents: 08f0aba 2247ff9 Author: Stefan Bodewig <bode...@apache.org> Authored: Tue Apr 25 20:41:32 2017 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Tue Apr 25 20:45:38 2017 +0200 ---------------------------------------------------------------------- src/changes/changes.xml | 15 +++++ .../commons/compress/MemoryLimitException.java | 62 +++++++++++++++++++ .../compressors/CompressorStreamFactory.java | 40 +++++++++--- .../lzma/LZMACompressorInputStream.java | 21 ++++++- .../compressors/lzw/LZWInputStream.java | 25 ++++++++ .../compressors/xz/XZCompressorInputStream.java | 62 ++++++++++++++++--- .../compressors/z/ZCompressorInputStream.java | 11 +++- .../compressors/DetectCompressorTestCase.java | 54 ++++++++++++++++ src/test/resources/COMPRESS-382 | Bin 0 -> 19 bytes src/test/resources/COMPRESS-386 | 1 + 10 files changed, 270 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/5def510d/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index ce0105f,8b1bedc..3b24da7 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -79,11 -79,6 +79,26 @@@ The <action> type attribute can be add, <action issue="COMPRESS-387" type="fix" date="2017-04-18"> Make unit tests work on Windows paths with spaces in their names. </action> + <action issue="COMPRESS-388" type="update" date="2017-04-25" + due-to="Zbynek Vyskovsky"> + Improved performance for concurrent reads from ZipFile when + reading from a file. + </action> ++ <action issue="COMPRESS-382" type="add" date="2017-04-25" ++ due-to="Tim Allison"> ++ Added a way to limit amount of memory ZCompressorStream may ++ use. ++ </action> ++ <action issue="COMPRESS-386" type="add" date="2017-04-25" ++ due-to="Tim Allison"> ++ Added a way to limit amount of memory ZCompressorStream may ++ use. ++ </action> ++ <action issue="COMPRESS-382" type="add" date="2017-04-25" ++ due-to="Tim Allison"> ++ Added a way to limit amount of memory LZMACompressorStream and ++ XZCompressorInputStream may use. ++ </action> </release> <release version="1.13" date="2016-12-29" description="Release 1.13 - API compatible to 1.12 but requires Java 7 at runtime.">
