Repository: commons-compress Updated Branches: refs/heads/master d681042e6 -> 932d4f899
Unnecessary casts. Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/932d4f89 Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/932d4f89 Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/932d4f89 Branch: refs/heads/master Commit: 932d4f89922e96fb1b89ba220d124db187ab7741 Parents: d681042 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Tue May 2 00:06:59 2017 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Tue May 2 00:06:59 2017 -0700 ---------------------------------------------------------------------- .../commons/compress/archivers/dump/TapeInputStream.java | 2 +- .../compressors/bzip2/BZip2CompressorInputStream.java | 10 +++++----- .../compressors/lz4/FramedLZ4CompressorInputStream.java | 2 +- .../commons/compress/compressors/lzw/LZWInputStream.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/932d4f89/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java b/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java index b6f9f12..dcc3826 100644 --- a/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java @@ -182,7 +182,7 @@ class TapeInputStream extends FilterInputStream { if ((readOffset + (len - bytes)) <= blockSize) { // we can read entirely from the buffer. - n = (long) len - bytes; + n = len - bytes; } else { // copy what we can from the buffer. n = (long) blockSize - readOffset; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/932d4f89/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java index bce1d3d..45bd063 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java @@ -396,7 +396,7 @@ public class BZip2CompressorInputStream extends CompressorInputStream implements } private static int bsGetInt(BitInputStream bin) throws IOException { - return (int) bsR(bin, 32); + return bsR(bin, 32); } /** @@ -612,7 +612,7 @@ public class BZip2CompressorInputStream extends CompressorInputStream implements } int zn = minLens_zt; - int zvec = (int) bsR(bin, zn); + int zvec = bsR(bin, zn); while(zvec > limit_zt[zn]) { zn++; zvec = (zvec << 1) | bsR(bin, 1); @@ -666,10 +666,10 @@ public class BZip2CompressorInputStream extends CompressorInputStream implements } int zn = minLens_zt; - int zvec = (int) bsR(bin, zn); + int zvec = bsR(bin, zn); while(zvec > limit_zt[zn]) { zn++; - zvec = (zvec << 1) | (int) bsR(bin, 1); + zvec = (zvec << 1) | bsR(bin, 1); } nextSym = perm_zt[zvec - base_zt[zn]]; } @@ -686,7 +686,7 @@ public class BZip2CompressorInputStream extends CompressorInputStream implements int zvec = bsR(bin, zn); while (zvec > limit_zt[zn]) { zn++; - zvec = (zvec << 1) | (int) bsR(bin, 1); + zvec = (zvec << 1) | bsR(bin, 1); } return dataShadow.perm[zt][zvec - dataShadow.base[zt][zn]]; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/932d4f89/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java index f0bb329..050deeb 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java @@ -214,7 +214,7 @@ public class FramedLZ4CompressorInputStream extends CompressorInputStream { contentHash.update(bdByte); if (expectContentSize) { // for now we don't care, contains the uncompressed size byte[] contentSize = new byte[8]; - int skipped = (int) IOUtils.readFully(in, contentSize); + int skipped = IOUtils.readFully(in, contentSize); count(skipped); if (8 != skipped) { throw new IOException("Premature end of stream while reading content size"); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/932d4f89/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java index 2a6127d..eb5f937 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java @@ -129,7 +129,7 @@ public abstract class LZWInputStream extends CompressorInputStream { long memoryUsageInBytes = (long) maxTableSize * 6;//(4 (prefixes) + 1 (characters) +1 (outputStack)) long memoryUsageInKb = memoryUsageInBytes >> 10; - if (memoryUsageInKb > (long)memoryLimitInKb) { + if (memoryUsageInKb > memoryLimitInKb) { throw new MemoryLimitException(memoryUsageInKb, memoryLimitInKb); } }
