subject:"commons\-compress git commit\: make Sonar less unhappy"

commons-compress git commit: make Sonar less unhappy

2018-10-07 Thread bodewig

Repository: commons-compress
Updated Branches:
  refs/heads/master 14242fe6b -> 7a3889d47


make Sonar less unhappy


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/7a3889d4
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/7a3889d4
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/7a3889d4

Branch: refs/heads/master
Commit: 7a3889d47b76b248deb4ae6d3c71cf7cf48dc734
Parents: 14242fe
Author: Stefan Bodewig 
Authored: Sun Oct 7 21:09:27 2018 +0200
Committer: Stefan Bodewig 
Committed: Sun Oct 7 21:09:27 2018 +0200

--
 .../commons/compress/archivers/ArchiveStreamFactory.java   | 2 +-
 .../compress/archivers/cpio/CpioArchiveInputStream.java| 2 +-
 .../apache/commons/compress/archivers/sevenz/DeltaDecoder.java | 2 +-
 .../apache/commons/compress/archivers/sevenz/LZMA2Decoder.java | 2 +-
 .../apache/commons/compress/archivers/tar/TarArchiveEntry.java | 4 ++--
 .../org/apache/commons/compress/archivers/tar/TarUtils.java| 4 ++--
 .../apache/commons/compress/archivers/zip/ExtraFieldUtils.java | 6 +++---
 .../commons/compress/archivers/zip/ZipArchiveOutputStream.java | 2 +-
 .../org/apache/commons/compress/archivers/zip/ZipFile.java | 4 ++--
 .../apache/commons/compress/changes/ChangeSetPerformer.java| 2 +-
 .../compress/compressors/gzip/GzipCompressorInputStream.java   | 4 ++--
 .../apache/commons/compress/compressors/lzma/LZMAUtils.java| 4 ++--
 .../compressors/pack200/Pack200CompressorInputStream.java  | 2 +-
 .../org/apache/commons/compress/compressors/xz/XZUtils.java| 4 ++--
 src/main/java/org/apache/commons/compress/utils/IOUtils.java   | 2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/7a3889d4/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java 
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
index 3cd8ba7..0a1e223 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
@@ -551,7 +551,7 @@ public class ArchiveStreamFactory implements 
ArchiveStreamProvider {
 if (tais.getNextTarEntry().isCheckSumOK()) {
 return TAR;
 }
-} catch (final Exception e) { // NOPMD // NOSONAR
+} catch (final Exception e) { // NOPMD NOSONAR
 // can generate IllegalArgumentException as well
 // as IOException
 // autodetection, simply not a TAR

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/7a3889d4/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
 
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
index 4cedc27..39d479c 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
@@ -203,7 +203,7 @@ public class CpioArchiveInputStream extends 
ArchiveInputStream implements
 private void closeEntry() throws IOException {
 // the skip implementation of this class will not skip more
 // than Integer.MAX_VALUE bytes
-while (skip((long) Integer.MAX_VALUE) == Integer.MAX_VALUE) { // NOPMD
+while (skip((long) Integer.MAX_VALUE) == Integer.MAX_VALUE) { // NOPMD 
NOSONAR
 // do nothing
 }
 }

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/7a3889d4/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java 
b/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
index bc58c63..d2b3c3d 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
@@ -41,7 +41,7 @@ class DeltaDecoder extends CoderBase {
 final int distance = numberOptionOrDefault(options, 1);
 try {
 return new DeltaOptions(distance).getOutputStream(new 
FinishableWrapperOutputStream(out));
-} catch (final UnsupportedOptionsException ex) {
+}

[2/2] commons-compress git commit: make Sonar less unhappy

2018-08-16 Thread bodewig

make Sonar less unhappy


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/087e4a9d
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/087e4a9d
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/087e4a9d

Branch: refs/heads/master
Commit: 087e4a9d51437243eb0a4698b3bd2b71b4567c3e
Parents: 1efa5de
Author: Stefan Bodewig 
Authored: Thu Aug 16 14:48:50 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu Aug 16 14:48:50 2018 +0200

--
 .../commons/compress/archivers/ar/ArArchiveInputStream.java| 6 ++
 .../apache/commons/compress/archivers/examples/Expander.java   | 6 ++
 .../commons/compress/archivers/zip/ZipArchiveInputStream.java  | 6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/087e4a9d/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
 
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
index 3ed8f2f..206d388 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
@@ -264,13 +264,11 @@ public class ArArchiveInputStream extends 
ArchiveInputStream {
 if (currentEntry == null) {
 throw new IllegalStateException("No current ar entry");
 }
-int toRead = len;
 final long entryEnd = entryOffset + currentEntry.getLength();
-if (len > 0 && entryEnd > offset) {
-toRead = (int) Math.min(len, entryEnd - offset);
-} else {
+if (len < 0 || offset >= entryEnd) {
 return -1;
 }
+final int toRead = (int) Math.min(len, entryEnd - offset);
 final int ret = this.input.read(b, off, toRead);
 trackReadBytes(ret);
 return ret;

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/087e4a9d/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java 
b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
index cfaba87..4922527 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
@@ -222,11 +222,9 @@ public class Expander {
 @Override
 public void writeEntryDataTo(ArchiveEntry entry, OutputStream out) 
throws IOException {
 final byte[] buffer = new byte[8024];
-int n = 0;
-long count = 0;
+int n;
 while (-1 != (n = archive.read(buffer))) {
 out.write(buffer, 0, n);
-count += n;
 }
 }
 }, targetDirectory);
@@ -240,7 +238,7 @@ public class Expander {
 throws IOException {
 String targetDirPath = targetDirectory.getCanonicalPath();
 if (!targetDirPath.endsWith(File.separator)) {
-targetDirPath += File.separatorChar;
+targetDirPath += File.separator;
 }
 ArchiveEntry nextEntry = supplier.getNextReadableEntry();
 while (nextEntry != null) {

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/087e4a9d/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 e1995d7..196e402 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
@@ -246,7 +246,7 @@ public class ZipArchiveInputStream extends 
ArchiveInputStream implements InputSt
 } else {
 readFully(lfhBuf);
 }
-} catch (final EOFException e) {
+} catch (final EOFException e) { //NOSONAR
 return null;
 }
 
@@ -1120,7 +1120,7 @@ public class ZipArchiveInputStream extends 
ArchiveInputStream implements InputSt
 // LFH has already been read and all but the first eight bytes contain 
(part of) the APK signing block,
 // also subtract 16 bytes in order to position us at the magic string

[5/5] commons-compress git commit: make Sonar less unhappy

2017-07-06 Thread bodewig

make Sonar less unhappy


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/b4445543
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/b4445543
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/b4445543

Branch: refs/heads/master
Commit: b4445543def1cc905f66334d42f250d5a637a01d
Parents: af48720
Author: Stefan Bodewig 
Authored: Thu Jul 6 09:53:36 2017 +0200
Committer: Stefan Bodewig 
Committed: Thu Jul 6 09:53:36 2017 +0200

--
 .../commons/compress/archivers/sevenz/CLI.java  |  8 
 .../compress/archivers/zip/NioZipEncoding.java  | 16 ++--
 2 files changed, 10 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b4445543/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java 
b/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
index 0db5a42..8caac74 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/CLI.java
@@ -64,7 +64,7 @@ public class CLI {
 }
 },
 EXTRACT("Extracting") {
-private  final byte[] BUF = new byte[8192];
+private final byte[] buf = new byte[8192];
 @Override
 public void takeAction(final SevenZFile archive, final 
SevenZArchiveEntry entry) 
 throws IOException {
@@ -86,8 +86,8 @@ public class CLI {
 final long total = entry.getSize();
 long off = 0;
 while (off < total) {
-final int toRead = (int) Math.min(total - off, 
BUF.length);
-final int bytesRead = archive.read(BUF, 0, toRead);
+final int toRead = (int) Math.min(total - off, 
buf.length);
+final int bytesRead = archive.read(buf, 0, toRead);
 if (bytesRead < 1) {
 throw new IOException("reached end of entry "
   + entry.getName()
@@ -96,7 +96,7 @@ public class CLI {
   + total);
 }
 off += bytesRead;
-fos.write(BUF, 0, bytesRead);
+fos.write(buf, 0, bytesRead);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/b4445543/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
index 323f838..98d26d9 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
@@ -41,6 +41,10 @@ class NioZipEncoding implements ZipEncoding, HasCharset {
 private static final char REPLACEMENT = '?';
 private static final byte[] REPLACEMENT_BYTES = { (byte) REPLACEMENT };
 private static final String REPLACEMENT_STRING = 
String.valueOf(REPLACEMENT);
+private static final char[] HEX_CHARS = new char[] {
+'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 
'E', 'F'
+};
+
 
 /**
  * Construct an NioZipEncoding using the given charset.
@@ -86,18 +90,14 @@ class NioZipEncoding implements ZipEncoding, HasCharset {
 // write the unmappable characters in utf-16
 // pseudo-URL encoding style to ByteBuffer.
 
-int spaceForSurrogate = estimateIncrementalEncodingSize(enc, 
(6 * res.length()));
+int spaceForSurrogate = estimateIncrementalEncodingSize(enc, 6 
* res.length());
 if (spaceForSurrogate > out.remaining()) {
 // if the destination buffer isn't over sized, assume that 
the presence of one
 // unmappable character makes it likely that there will be 
more. Find all the
 // un-encoded characters and allocate space based on those 
estimates.
 int charCount = 0;
 for (int i = cb.position() ; i < cb.limit(); i++) {
-if (!enc.canEncode(cb.get(i))) {
-charCount+= 6;
-} else {
-

commons-compress git commit: make Sonar less unhappy

2017-06-24 Thread bodewig

Repository: commons-compress
Updated Branches:
  refs/heads/master fb9b61804 -> c93d3e1d7


make Sonar less unhappy


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/c93d3e1d
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/c93d3e1d
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/c93d3e1d

Branch: refs/heads/master
Commit: c93d3e1d7db2971a4e1e7e79d7bf933268cb970e
Parents: fb9b618
Author: Stefan Bodewig 
Authored: Sat Jun 24 18:10:45 2017 +0200
Committer: Stefan Bodewig 
Committed: Sat Jun 24 18:16:31 2017 +0200

--
 .../archivers/zip/ZipArchiveOutputStream.java   |  3 +-
 .../compress/archivers/zip/ZipConstants.java|  4 +--
 .../utils/FixedLengthBlockOutputStream.java | 33 +++-
 3 files changed, 23 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/c93d3e1d/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 63aeba7..cb594f2 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
@@ -760,7 +760,8 @@ public class ZipArchiveOutputStream extends 
ArchiveOutputStream {
 
 final Zip64ExtendedInformationExtraField z64 = 
getZip64Extra(entry.entry);
 
-ZipEightByteInteger size, compressedSize;
+ZipEightByteInteger size;
+ZipEightByteInteger compressedSize;
 if (phased) {
 // sizes are already known
 size = new ZipEightByteInteger(entry.entry.getSize());

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/c93d3e1d/src/main/java/org/apache/commons/compress/archivers/zip/ZipConstants.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipConstants.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipConstants.java
index 23f04a8..c230991 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipConstants.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipConstants.java
@@ -23,8 +23,6 @@ package org.apache.commons.compress.archivers.zip;
  * @since 1.3
  */
 final class ZipConstants {
-private ZipConstants() { }
-
 /** Masks last eight bits */
 static final int BYTE_MASK = 0xFF;
 
@@ -64,4 +62,6 @@ final class ZipConstants {
  */
 static final long ZIP64_MAGIC = 0xL;
 
+private ZipConstants() { }
+
 }

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/c93d3e1d/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
 
b/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
index 8fe6d20..6c93f34 100644
--- 
a/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
+++ 
b/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
@@ -102,7 +102,7 @@ public class FixedLengthBlockOutputStream extends 
OutputStream implements Writab
 
 @Override
 public void write(int b) throws IOException {
-if(!isOpen()) {
+if (!isOpen()) {
 throw new ClosedChannelException();
 }
 buffer.put((byte) b);
@@ -110,10 +110,12 @@ public class FixedLengthBlockOutputStream extends 
OutputStream implements Writab
 }
 
 @Override
-public void write(byte[] b, int off, int len) throws IOException {
-if(!isOpen()) {
+public void write(byte[] b, final int offset, final int length) throws 
IOException {
+if (!isOpen()) {
 throw new ClosedChannelException();
 }
+int off = offset;
+int len = length;
 while (len > 0) {
 int n = Math.min(len, buffer.remaining());
 buffer.put(b, off, n);
@@ -125,7 +127,7 @@ public class FixedLengthBlockOutputStream extends 
OutputStream implements Writab
 
 @Override
 public int write(ByteBuffer src) throws IOException {
-if(!isOpen()) {
+if (!isOpen()) {
 throw new ClosedChannelException();
 }
 int srcRemaining = src.remaining();
@@ -161,7 +163,7 @@ public class

commons-compress git commit: make Sonar less unhappy

2017-05-10 Thread bodewig

Repository: commons-compress
Updated Branches:
  refs/heads/master 3240f2526 -> ca7ea939e


make Sonar less unhappy


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/ca7ea939
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/ca7ea939
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/ca7ea939

Branch: refs/heads/master
Commit: ca7ea939eaa9dad5f00c8a5e269f09681602bc98
Parents: 3240f25
Author: Stefan Bodewig 
Authored: Wed May 10 17:15:59 2017 +0200
Committer: Stefan Bodewig 
Committed: Wed May 10 17:15:59 2017 +0200

--
 .../org/apache/commons/compress/MemoryLimitException.java |  2 +-
 .../commons/compress/archivers/ArchiveStreamFactory.java  | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ca7ea939/src/main/java/org/apache/commons/compress/MemoryLimitException.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/MemoryLimitException.java 
b/src/main/java/org/apache/commons/compress/MemoryLimitException.java
index 1c5ec07..fe68c0b 100644
--- a/src/main/java/org/apache/commons/compress/MemoryLimitException.java
+++ b/src/main/java/org/apache/commons/compress/MemoryLimitException.java
@@ -57,7 +57,7 @@ public class MemoryLimitException extends IOException {
 }
 
 private static String buildMessage(long memoryNeededInKb, int 
memoryLimitInKb) {
-return "" + memoryNeededInKb + " kb of memory would be needed; limit 
was "
+return memoryNeededInKb + " kb of memory would be needed; limit was "
 + memoryLimitInKb + " kb. " +
 "If the file is not corrupt, consider increasing the memory 
limit.";
 }

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ca7ea939/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java 
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
index ca15363..916e3e1 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
@@ -499,14 +499,14 @@ public class ArchiveStreamFactory implements 
ArchiveStreamProvider {
 signatureLength = IOUtils.readFully(in, signature);
 in.reset();
 } catch (IOException e) {
-throw new ArchiveException("IOException while reading signature.");
+throw new ArchiveException("IOException while reading signature.", 
e);
 }
 
 if (ZipArchiveInputStream.matches(signature, signatureLength)) {
 return ZIP;
 } else if (JarArchiveInputStream.matches(signature, signatureLength)) {
 return JAR;
-} if (ArArchiveInputStream.matches(signature, signatureLength)) {
+} else if (ArArchiveInputStream.matches(signature, signatureLength)) {
 return AR;
 } else if (CpioArchiveInputStream.matches(signature, signatureLength)) 
{
 return CPIO;
@@ -523,7 +523,7 @@ public class ArchiveStreamFactory implements 
ArchiveStreamProvider {
 signatureLength = IOUtils.readFully(in, dumpsig);
 in.reset();
 } catch (IOException e) {
-throw new ArchiveException("IOException while reading dump 
signature");
+throw new ArchiveException("IOException while reading dump 
signature", e);
 }
 if (DumpArchiveInputStream.matches(dumpsig, signatureLength)) {
 return DUMP;
@@ -536,7 +536,7 @@ public class ArchiveStreamFactory implements 
ArchiveStreamProvider {
 signatureLength = IOUtils.readFully(in, tarHeader);
 in.reset();
 } catch (IOException e) {
-throw new ArchiveException("IOException while reading tar 
signature");
+throw new ArchiveException("IOException while reading tar 
signature", e);
 }
 if (TarArchiveInputStream.matches(tarHeader, signatureLength)) {
 return TAR;
@@ -551,7 +551,7 @@ public class ArchiveStreamFactory implements 
ArchiveStreamProvider {
 if (tais.getNextTarEntry().isCheckSumOK()) {
 return TAR;
 }
-} catch (final Exception e) { // NOPMD
+} catch (final Exception e) { // NOPMD // NOSONAR
 // can generate IllegalArgumentException as well
 // as IOException
 // autodetection, simply not a TAR

[3/3] commons-compress git commit: make Sonar less unhappy

2017-02-08 Thread bodewig

make Sonar less unhappy


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/72fec65e
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/72fec65e
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/72fec65e

Branch: refs/heads/master
Commit: 72fec65e1c09e14b92a21aae5d0f0dd20e8fe4ef
Parents: b1e5248
Author: Stefan Bodewig 
Authored: Wed Feb 8 18:04:53 2017 +0100
Committer: Stefan Bodewig 
Committed: Wed Feb 8 18:04:53 2017 +0100

--
 .../lz77support/AbstractLZ77CompressorInputStream.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/72fec65e/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
--
diff --git 
a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
 
b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
index 284b79f..13e5331 100644
--- 
a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
+++ 
b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
@@ -224,8 +224,8 @@ public abstract class AbstractLZ77CompressorInputStream 
extends CompressorInputS
 
 private void tryToReadLiteral(int bytesToRead) throws IOException {
 // min of "what is still inside the literal", "what does the user 
want" and "how muc can fit into the buffer"
-final int reallyTryToRead = (int) Math.min(Math.min(bytesToRead, 
bytesRemaining),
-   buf.length - writeIndex);
+final int reallyTryToRead = Math.min((int) Math.min(bytesToRead, 
bytesRemaining),
+ buf.length - writeIndex);
 final int bytesRead = reallyTryToRead > 0
 ? IOUtils.readFully(in, buf, writeIndex, reallyTryToRead)
 : 0 /* happens for bytesRemaining == 0 */;
@@ -285,8 +285,8 @@ public abstract class AbstractLZ77CompressorInputStream 
extends CompressorInputS
 private void tryToCopy(int bytesToCopy) {
 // this will fit into the buffer without sliding and not
 // require more than is available inside the back-reference
-int copy = (int) Math.min(Math.min(bytesToCopy, bytesRemaining),
-  buf.length - writeIndex);
+int copy = Math.min((int) Math.min(bytesToCopy, bytesRemaining),
+buf.length - writeIndex);
 if (copy == 0) {
 // NOP
 } else if (backReferenceOffset == 1) { // pretty common special case

commons-compress git commit: make Sonar less unhappy

[2/2] commons-compress git commit: make Sonar less unhappy

[5/5] commons-compress git commit: make Sonar less unhappy

commons-compress git commit: make Sonar less unhappy

commons-compress git commit: make Sonar less unhappy

[3/3] commons-compress git commit: make Sonar less unhappy

6 matches

Site Navigation

Mail list logo

Footer information