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 2016/12/19 17:42:34 UTC
[4/4] commons-compress git commit: trivial fixes of "bugs" reported
by Sonar
trivial fixes of "bugs" reported by Sonar
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/8705e97f
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/8705e97f
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/8705e97f
Branch: refs/heads/master
Commit: 8705e97fbd1aa9de951456f05dff9ec56c4344b2
Parents: d5867f1
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Dec 19 18:38:34 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Dec 19 18:42:11 2016 +0100
----------------------------------------------------------------------
.../compress/archivers/cpio/CpioArchiveOutputStream.java | 8 ++++----
.../compress/archivers/dump/DumpArchiveInputStream.java | 6 +++---
.../commons/compress/archivers/dump/TapeInputStream.java | 2 +-
.../commons/compress/archivers/sevenz/SevenZOutputFile.java | 2 +-
.../compress/archivers/tar/TarArchiveOutputStream.java | 2 +-
.../org/apache/commons/compress/archivers/tar/TarUtils.java | 2 +-
.../compress/archivers/zip/ParallelScatterZipCreator.java | 2 +-
.../compress/archivers/zip/ZipArchiveInputStream.java | 4 ++--
.../compress/archivers/zip/ZipArchiveOutputStream.java | 2 +-
.../org/apache/commons/compress/archivers/zip/ZipFile.java | 2 +-
.../apache/commons/compress/changes/ChangeSetPerformer.java | 3 ++-
.../apache/commons/compress/compressors/bzip2/BlockSort.java | 6 ++++--
.../compressors/pack200/Pack200CompressorOutputStream.java | 4 ++--
.../snappy/FramedSnappyCompressorInputStream.java | 2 +-
14 files changed, 25 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
index 105e86c..02a53b8 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
@@ -299,7 +299,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
writeAsciiLong(devMin, 8, 16);
writeAsciiLong(entry.getRemoteDeviceMaj(), 8, 16);
writeAsciiLong(entry.getRemoteDeviceMin(), 8, 16);
- writeAsciiLong(entry.getName().length() + 1, 8, 16);
+ writeAsciiLong(entry.getName().length() + 1l, 8, 16);
writeAsciiLong(entry.getChksum(), 8, 16);
writeCString(entry.getName());
pad(entry.getHeaderPadCount());
@@ -330,7 +330,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
writeAsciiLong(entry.getNumberOfLinks(), 6, 8);
writeAsciiLong(entry.getRemoteDevice(), 6, 8);
writeAsciiLong(entry.getTime(), 11, 8);
- writeAsciiLong(entry.getName().length() + 1, 6, 8);
+ writeAsciiLong(entry.getName().length() + 1l, 6, 8);
writeAsciiLong(entry.getSize(), 11, 8);
writeCString(entry.getName());
}
@@ -360,7 +360,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
writeBinaryLong(entry.getNumberOfLinks(), 2, swapHalfWord);
writeBinaryLong(entry.getRemoteDevice(), 2, swapHalfWord);
writeBinaryLong(entry.getTime(), 4, swapHalfWord);
- writeBinaryLong(entry.getName().length() + 1, 2, swapHalfWord);
+ writeBinaryLong(entry.getName().length() + 1l, 2, swapHalfWord);
writeBinaryLong(entry.getSize(), 4, swapHalfWord);
writeCString(entry.getName());
pad(entry.getHeaderPadCount());
@@ -519,7 +519,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
}
if (tmp.length() <= length) {
- final long insertLength = length - tmp.length();
+ final int insertLength = length - tmp.length();
for (int pos = 0; pos < insertLength; pos++) {
tmp.insert(0, "0");
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
index f2d82ef..72eefd7 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
@@ -185,7 +185,7 @@ public class DumpArchiveInputStream extends ArchiveInputStream {
}
// we don't do anything with this yet.
- if (raw.skip(DumpArchiveConstants.TP_SIZE * active.getHeaderCount())
+ if (raw.skip((long) DumpArchiveConstants.TP_SIZE * active.getHeaderCount())
== -1) {
throw new EOFException();
}
@@ -209,7 +209,7 @@ public class DumpArchiveInputStream extends ArchiveInputStream {
}
// we don't do anything with this yet.
- if (raw.skip(DumpArchiveConstants.TP_SIZE * active.getHeaderCount())
+ if (raw.skip((long) DumpArchiveConstants.TP_SIZE * active.getHeaderCount())
== -1) {
throw new EOFException();
}
@@ -264,7 +264,7 @@ public class DumpArchiveInputStream extends ArchiveInputStream {
// skip any remaining segments for prior file.
while (DumpArchiveConstants.SEGMENT_TYPE.ADDR == active.getHeaderType()) {
- if (raw.skip(DumpArchiveConstants.TP_SIZE
+ if (raw.skip((long) DumpArchiveConstants.TP_SIZE
* (active.getHeaderCount()
- active.getHeaderHoles())) == -1) {
throw new EOFException();
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/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 08c6a00..834d727 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 = len - bytes;
+ n = (long) len - bytes;
} else {
// copy what we can from the buffer.
n = blockSize - readOffset;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
index f0080d1..32bdeb8 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
@@ -438,7 +438,7 @@ public class SevenZOutputFile implements Closeable {
writeUint64(header, numCoders);
header.write(bos.toByteArray());
- for (int i = 0; i < numCoders - 1; i++) {
+ for (long i = 0; i < numCoders - 1; i++) {
writeUint64(header, i + 1);
writeUint64(header, i);
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
index 3d34e96..cf51dfd 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
@@ -677,7 +677,7 @@ public class TarArchiveOutputStream extends ArchiveOutputStream {
// of which are the link's name
final TarArchiveEntry longLinkEntry = new TarArchiveEntry(TarConstants.GNU_LONGLINK, linkType);
- longLinkEntry.setSize(len + 1); // +1 for NUL
+ longLinkEntry.setSize(len + 1l); // +1 for NUL
transferModTime(entry, longLinkEntry);
putArchiveEntry(longLinkEntry);
write(encodedName.array(), encodedName.arrayOffset(), len);
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
index 90e7294..85f7844 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
@@ -193,7 +193,7 @@ public class TarUtils {
if (negative) {
// 2's complement
val--;
- val ^= (long) Math.pow(2, (length - 1) * 8) - 1;
+ val ^= (long) Math.pow(2.0, (length - 1) * 8) - 1;
}
return negative ? -val : val;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
index 6d407e3..7d6c675 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
@@ -240,7 +240,7 @@ public class ParallelScatterZipCreator {
}
es.shutdown();
- es.awaitTermination(1000 * 60, TimeUnit.SECONDS); // == Infinity. We really *must* wait for this to complete
+ es.awaitTermination(1000 * 60l, TimeUnit.SECONDS); // == Infinity. We really *must* wait for this to complete
// It is important that all threads terminate before we go on, ensure happens-before relationship
compressionDoneAt = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index 51b1930..c127d36 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -916,9 +916,9 @@ public class ZipArchiveInputStream extends ArchiveInputStream {
// skip over central directory. One LFH has been read too much
// already. The calculation discounts file names and extra
// data so it will be too short.
- realSkip(entriesRead * CFH_LEN - LFH_LEN);
+ realSkip((long) entriesRead * CFH_LEN - LFH_LEN);
findEocdRecord();
- realSkip(ZipFile.MIN_EOCD_SIZE - WORD /* signature */ - SHORT /* comment len */);
+ realSkip((long) ZipFile.MIN_EOCD_SIZE - WORD /* signature */ - SHORT /* comment len */);
readFully(SHORT_BUF);
// file comment
realSkip(ZipShort.getValue(SHORT_BUF));
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index 9c7ae56..a1fa568 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -1386,7 +1386,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
+ DWORD /* number of entries in CD on this disk */
+ DWORD /* total number of entries */
+ DWORD /* size of CD */
- + DWORD /* offset of CD */
+ + (long) DWORD /* offset of CD */
));
// version made by and version needed to extract
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index bec373c..2b8d15b 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -1020,7 +1020,7 @@ public class ZipFile implements Closeable {
/* last mod file date */ + SHORT
/* crc-32 */ + WORD
/* compressed size */ + WORD
- /* uncompressed size */ + WORD;
+ /* uncompressed size */ + (long) WORD;
/**
* Walks through all recorded entries and adds the data available
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
index 3f7f9d6..b16b3eb 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
@@ -273,7 +273,8 @@ public class ChangeSetPerformer {
}
@Override
public ArchiveEntry next() {
- return current = nestedEnum.nextElement();
+ current = nestedEnum.nextElement();
+ return current;
}
@Override
public InputStream getInputStream() throws IOException {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
index 63a3da3..e2c1232 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
@@ -446,8 +446,10 @@ class BlockSort {
private int[] eclass;
private int[] getEclass() {
- return eclass == null
- ? (eclass = new int[quadrant.length / 2]) : eclass;
+ if (eclass == null) {
+ eclass = new int[quadrant.length / 2];
+ }
+ return eclass;
}
/*
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
index ca27100..41857ac 100644
--- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
@@ -133,8 +133,8 @@ public class Pack200CompressorOutputStream extends CompressorOutputStream {
JarInputStream ji = null;
boolean success = false;
try {
- p.pack(ji = new JarInputStream(streamBridge.getInput()),
- originalOutput);
+ ji = new JarInputStream(streamBridge.getInput());
+ p.pack(ji, originalOutput);
success = true;
} finally {
if (!success) {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8705e97f/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
index 72c9041..d7f4209 100644
--- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
@@ -203,7 +203,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream {
expectedChecksum = unmask(readCrc());
} else if (type == COMPRESSED_CHUNK_TYPE) {
final boolean expectChecksum = dialect.usesChecksumWithCompressedChunks();
- final long size = readSize() - (expectChecksum ? 4 : 0);
+ final long size = readSize() - (expectChecksum ? 4l : 0l);
if (expectChecksum) {
expectedChecksum = unmask(readCrc());
} else {