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 80657d3 make TarArchiveStructSparse immutable
80657d3 is described below
commit 80657d31997ed64aeef57376402985258430a8f9
Author: Stefan Bodewig <[email protected]>
AuthorDate: Thu Jan 23 18:24:09 2020 +0100
make TarArchiveStructSparse immutable
---
.../archivers/tar/TarArchiveInputStream.java | 25 ++++++++++++++--------
.../archivers/tar/TarArchiveStructSparse.java | 15 +++----------
2 files changed, 19 insertions(+), 21 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 d2b690b..920c8fd 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
@@ -678,7 +678,7 @@ public class TarArchiveInputStream extends
ArchiveInputStream {
Map<String, String> parsePaxHeaders(final InputStream inputStream,
List<TarArchiveStructSparse> sparseHeaders)
throws IOException {
final Map<String, String> headers = new HashMap<>(globalPaxHeaders);
- TarArchiveStructSparse sparseHeader = null;
+ Long offset = null;
// Format is "length keyword=value\n";
while(true) { // get length
int ch;
@@ -715,19 +715,22 @@ public class TarArchiveInputStream extends
ArchiveInputStream {
headers.put(keyword, value);
// for 0.0 PAX Headers
- if(keyword.equals("GNU.sparse.offset")) {
- sparseHeader = new
TarArchiveStructSparse(Long.parseLong(value), 0);
- sparseHeaders.add(sparseHeader);
+ if (keyword.equals("GNU.sparse.offset")) {
+ if (offset != null) {
+ // previous GNU.sparse.offset header
but but no numBytes
+ sparseHeaders.add(new
TarArchiveStructSparse(offset, 0));
+ }
+ offset = new Long(value);
}
// for 0.0 PAX Headers
- if(keyword.equals("GNU.sparse.numbytes")) {
- if(sparseHeader == null) {
+ if (keyword.equals("GNU.sparse.numbytes")) {
+ if (offset == null) {
throw new IOException("Failed to read
Paxheader." +
- "GNU.sparse.offset is expected
before GNU.sparse.numbytes show up.");
+ "GNU.sparse.offset is expected
before GNU.sparse.numbytes shows up.");
}
-
-
sparseHeader.setNumbytes(Long.parseLong(value));
+ sparseHeaders.add(new
TarArchiveStructSparse(offset, Long.parseLong(value)));
+ offset = null;
}
}
break;
@@ -743,6 +746,10 @@ public class TarArchiveInputStream extends
ArchiveInputStream {
break;
}
}
+ if (offset != null) {
+ // offset but no numBytes
+ sparseHeaders.add(new TarArchiveStructSparse(offset, 0));
+ }
return headers;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java
index 916f532..d84f97b 100644
---
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java
+++
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java
@@ -32,10 +32,9 @@ import java.util.Objects;
* </pre>
* @since 1.20
*/
-public class TarArchiveStructSparse {
- private long offset;
-
- private long numbytes;
+public final class TarArchiveStructSparse {
+ private final long offset;
+ private final long numbytes;
public TarArchiveStructSparse(long offset, long numbytes) {
this.offset = offset;
@@ -72,15 +71,7 @@ public class TarArchiveStructSparse {
return offset;
}
- public void setOffset(long offset) {
- this.offset = offset;
- }
-
public long getNumbytes() {
return numbytes;
}
-
- public void setNumbytes(long numbytes) {
- this.numbytes = numbytes;
- }
}