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 2020/01/23 19:56:46 UTC
[commons-compress] branch master updated: a few more Sonar findings
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
The following commit(s) were added to refs/heads/master by this push:
new 011e9f0 a few more Sonar findings
011e9f0 is described below
commit 011e9f0c53a9e0ac1e98df345748fe1b539d95a9
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Thu Jan 23 20:56:25 2020 +0100
a few more Sonar findings
---
.../java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java | 4 ++--
.../apache/commons/compress/archivers/sevenz/SevenZOutputFile.java | 3 ++-
.../apache/commons/compress/archivers/tar/TarArchiveInputStream.java | 2 +-
.../apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java | 2 +-
.../compress/compressors/brotli/BrotliCompressorInputStream.java | 4 ++--
.../compress/compressors/pack200/Pack200CompressorInputStream.java | 4 ++--
.../compress/compressors/zstandard/ZstdCompressorInputStream.java | 4 ++--
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index 9838c79..e51fb55 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -126,7 +126,7 @@ public class SevenZFile implements Closeable {
* @since 1.19
*/
public SevenZFile(final File fileName, final char[] password, SevenZFileOptions options) throws IOException {
- this(Files.newByteChannel(fileName.toPath(), EnumSet.of(StandardOpenOption.READ)),
+ this(Files.newByteChannel(fileName.toPath(), EnumSet.of(StandardOpenOption.READ)), // NOSONAR
fileName.getAbsolutePath(), utf16Decode(password), true, options);
}
@@ -851,7 +851,7 @@ public class SevenZFile implements Closeable {
// would need to keep looping as above:
while (moreAlternativeMethods) {
throw new IOException("Alternative methods are unsupported, please report. " +
- "The reference implementation doesn't support them either.");
+ "The reference implementation doesn't support them either."); // NOSONAR
}
}
folder.coders = coders;
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 75f8867..f106b6b 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
@@ -309,7 +309,8 @@ public class SevenZOutputFile implements Closeable {
throw new IllegalStateException("No current 7z entry");
}
- OutputStream out = new OutputStreamWrapper();
+ // doesn't need to be closed, just wraps the instance field channel
+ OutputStream out = new OutputStreamWrapper(); // NOSONAR
final ArrayList<CountingOutputStream> moreStreams = new ArrayList<>();
boolean first = true;
for (final SevenZMethodConfiguration m : getContentMethods(files.get(files.size() - 1))) {
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
index e27b490..fef50c7 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
@@ -321,7 +321,7 @@ public class TarArchiveInputStream extends ArchiveInputStream {
* @param markLimit The limit to mark.
*/
@Override
- public void mark(final int markLimit) {
+ public synchronized void mark(final int markLimit) {
}
/**
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 f899895..234df74 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
@@ -536,7 +536,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
// calculate the length of end of central directory, as it may be used in writeZip64CentralDirectory
final ByteBuffer commentData = this.zipEncoding.encode(comment);
- final long commentLength = commentData.limit() - commentData.position();
+ final long commentLength = (long) commentData.limit() - commentData.position();
eocdLength = WORD /* length of EOCD_SIG */
+ SHORT /* number of this disk */
+ SHORT /* disk number of start of central directory */
diff --git a/src/main/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStream.java
index 5674cb2..6471020 100644
--- a/src/main/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStream.java
@@ -63,7 +63,7 @@ public class BrotliCompressorInputStream extends CompressorInputStream
}
@Override
- public void mark(final int readlimit) {
+ public synchronized void mark(final int readlimit) {
decIS.mark(readlimit);
}
@@ -92,7 +92,7 @@ public class BrotliCompressorInputStream extends CompressorInputStream
}
@Override
- public void reset() throws IOException {
+ public synchronized void reset() throws IOException {
decIS.reset();
}
diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java
index 7971ece..a669e6e 100644
--- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java
@@ -221,7 +221,7 @@ public class Pack200CompressorInputStream extends CompressorInputStream {
}
@Override
- public void mark(final int limit) {
+ public synchronized void mark(final int limit) {
try {
streamBridge.getInput().mark(limit);
} catch (final IOException ex) {
@@ -230,7 +230,7 @@ public class Pack200CompressorInputStream extends CompressorInputStream {
}
@Override
- public void reset() throws IOException {
+ public synchronized void reset() throws IOException {
streamBridge.getInput().reset();
}
diff --git a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
index 15b54c9..7b23794 100644
--- a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
@@ -64,7 +64,7 @@ public class ZstdCompressorInputStream extends CompressorInputStream
}
@Override
- public void mark(final int readlimit) {
+ public synchronized void mark(final int readlimit) {
decIS.mark(readlimit);
}
@@ -96,7 +96,7 @@ public class ZstdCompressorInputStream extends CompressorInputStream
}
@Override
- public void reset() throws IOException {
+ public synchronized void reset() throws IOException {
decIS.reset();
}