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
commit ad403183376fdd12881cc8fd48eab73e56334afd
Author: Stefan Bodewig <bode...@apache.org>
AuthorDate: Sat May 1 15:29:57 2021 +0200
whitespace changes only
---
.../archivers/tar/TarArchiveInputStream.java | 40 +++++++++---------
.../commons/compress/archivers/tar/TarFile.java | 48 +++++++++++-----------
2 files changed, 44 insertions(+), 44 deletions(-)
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 902af1f..63b9109 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
@@ -914,30 +914,30 @@ public class TarArchiveInputStream extends
ArchiveInputStream {
final List<TarArchiveStructSparse> sparseHeaders =
currEntry.getOrderedSparseHeaders();
- // Stream doesn't need to be closed at all as it doesn't use any
resources
- final InputStream zeroInputStream = new
TarArchiveSparseZeroInputStream(); //NOSONAR
- // logical offset into the extracted entry
- long offset = 0;
- for (final TarArchiveStructSparse sparseHeader : sparseHeaders) {
- final long zeroBlockSize = sparseHeader.getOffset() - offset;
- if (zeroBlockSize < 0) {
- // sparse header says to move backwards inside of the
extracted entry
- throw new IOException("Corrupted struct sparse detected");
- }
-
- // only store the zero block if it is not empty
- if (zeroBlockSize > 0) {
- sparseInputStreams.add(new
BoundedInputStream(zeroInputStream, sparseHeader.getOffset() - offset));
- }
+ // Stream doesn't need to be closed at all as it doesn't use any
resources
+ final InputStream zeroInputStream = new
TarArchiveSparseZeroInputStream(); //NOSONAR
+ // logical offset into the extracted entry
+ long offset = 0;
+ for (final TarArchiveStructSparse sparseHeader : sparseHeaders) {
+ final long zeroBlockSize = sparseHeader.getOffset() - offset;
+ if (zeroBlockSize < 0) {
+ // sparse header says to move backwards inside of the
extracted entry
+ throw new IOException("Corrupted struct sparse detected");
+ }
- // only store the input streams with non-zero size
- if (sparseHeader.getNumbytes() > 0) {
- sparseInputStreams.add(new BoundedInputStream(inputStream,
sparseHeader.getNumbytes()));
- }
+ // only store the zero block if it is not empty
+ if (zeroBlockSize > 0) {
+ sparseInputStreams.add(new BoundedInputStream(zeroInputStream,
sparseHeader.getOffset() - offset));
+ }
- offset = sparseHeader.getOffset() + sparseHeader.getNumbytes();
+ // only store the input streams with non-zero size
+ if (sparseHeader.getNumbytes() > 0) {
+ sparseInputStreams.add(new BoundedInputStream(inputStream,
sparseHeader.getNumbytes()));
}
+ offset = sparseHeader.getOffset() + sparseHeader.getNumbytes();
+ }
+
if (!sparseInputStreams.isEmpty()) {
currentSparseInputStreamIndex = 0;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
index 6bcd701..2ba4ee2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
@@ -337,34 +337,34 @@ public class TarFile implements Closeable {
final List<TarArchiveStructSparse> sparseHeaders =
currEntry.getOrderedSparseHeaders();
- // Stream doesn't need to be closed at all as it doesn't use any
resources
- final InputStream zeroInputStream = new
TarArchiveSparseZeroInputStream(); //NOSONAR
- // logical offset into the extracted entry
- long offset = 0;
- long numberOfZeroBytesInSparseEntry = 0;
- for (TarArchiveStructSparse sparseHeader : sparseHeaders) {
- final long zeroBlockSize = sparseHeader.getOffset() - offset;
- if (zeroBlockSize < 0) {
- // sparse header says to move backwards inside of the
extracted entry
- throw new IOException("Corrupted struct sparse detected");
- }
-
- // only store the zero block if it is not empty
- if (zeroBlockSize > 0) {
- streams.add(new BoundedInputStream(zeroInputStream,
zeroBlockSize));
- numberOfZeroBytesInSparseEntry += zeroBlockSize;
- }
+ // Stream doesn't need to be closed at all as it doesn't use any
resources
+ final InputStream zeroInputStream = new
TarArchiveSparseZeroInputStream(); //NOSONAR
+ // logical offset into the extracted entry
+ long offset = 0;
+ long numberOfZeroBytesInSparseEntry = 0;
+ for (TarArchiveStructSparse sparseHeader : sparseHeaders) {
+ final long zeroBlockSize = sparseHeader.getOffset() - offset;
+ if (zeroBlockSize < 0) {
+ // sparse header says to move backwards inside of the
extracted entry
+ throw new IOException("Corrupted struct sparse detected");
+ }
- // only store the input streams with non-zero size
- if (sparseHeader.getNumbytes() > 0) {
- final long start =
- currEntry.getDataOffset() +
sparseHeader.getOffset() - numberOfZeroBytesInSparseEntry;
- streams.add(new
BoundedSeekableByteChannelInputStream(start, sparseHeader.getNumbytes(),
archive));
- }
+ // only store the zero block if it is not empty
+ if (zeroBlockSize > 0) {
+ streams.add(new BoundedInputStream(zeroInputStream,
zeroBlockSize));
+ numberOfZeroBytesInSparseEntry += zeroBlockSize;
+ }
- offset = sparseHeader.getOffset() + sparseHeader.getNumbytes();
+ // only store the input streams with non-zero size
+ if (sparseHeader.getNumbytes() > 0) {
+ final long start =
+ currEntry.getDataOffset() + sparseHeader.getOffset() -
numberOfZeroBytesInSparseEntry;
+ streams.add(new BoundedSeekableByteChannelInputStream(start,
sparseHeader.getNumbytes(), archive));
}
+ offset = sparseHeader.getOffset() + sparseHeader.getNumbytes();
+ }
+
sparseInputStreams.put(currEntry.getName(), streams);
}
