Repository: commons-compress Updated Branches: refs/heads/master 61db5ea79 -> 30f1ac1dc
COMPRESS-332 snappy stream returns 0 when it should return -1 Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/30f1ac1d Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/30f1ac1d Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/30f1ac1d Branch: refs/heads/master Commit: 30f1ac1dcf7c333bbf5f2aa77e143f001216130c Parents: 61db5ea Author: Stefan Bodewig <[email protected]> Authored: Fri Jan 29 21:33:45 2016 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Fri Jan 29 21:36:10 2016 +0100 ---------------------------------------------------------------------- src/changes/changes.xml | 5 +++++ .../compressors/snappy/SnappyCompressorInputStream.java | 3 +++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/30f1ac1d/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 5ec8ef5..9e11741 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -44,6 +44,11 @@ The <action> type attribute can be add,update,fix,remove. <body> <release version="1.11" date="not released, yet" description="Release 1.11"> + <action issue="COMPRESS-332" type="fix" date="2016-01-29"> + SnappyCompressorInputStream and + FramedSnappyCompressorInputStream returned 0 at the end of the + stream under certain circumstances. + </action> <action issue="COMPRESS-326" type="fix" date="2015-10-24"> Adjusted unit test to updates in Java8 and later that change the logic of ZipEntry#getTime. http://git-wip-us.apache.org/repos/asf/commons-compress/blob/30f1ac1d/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java index cf08a64..b8887f2 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java @@ -135,6 +135,9 @@ public class SnappyCompressorInputStream extends CompressorInputStream { } int readable = Math.min(len, available()); + if (readable == 0 && len > 0) { + return -1; + } System.arraycopy(decompressBuf, readIndex, b, off, readable); readIndex += readable; if (readIndex > blockSize) {
