You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2021/07/10 09:17:02 UTC
[ant] branch master updated (7f9c5dd -> aa9ec68)
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.
from 7f9c5dd upgrade AntUnit
add 4e5b94a bz-65110 Fix the ant-testutil-sources.jar generation
add 6594a2d port some fixes from Commons Compress
new aa9ec68 Merge branch '1.9.x'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/org/apache/tools/tar/TarInputStream.java | 7 +++++--
src/main/org/apache/tools/zip/AsiExtraField.java | 12 ++++++++----
src/main/org/apache/tools/zip/ZipFile.java | 20 +++++++++++++++++++-
3 files changed, 32 insertions(+), 7 deletions(-)
[ant] 01/01: Merge branch '1.9.x'
Posted by bo...@apache.org.
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/ant.git
commit aa9ec682eac5781b835c0f2e2d0778785e6439df
Merge: 7f9c5dd 6594a2d
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Jul 10 11:15:18 2021 +0200
Merge branch '1.9.x'
src/main/org/apache/tools/tar/TarInputStream.java | 7 +++++--
src/main/org/apache/tools/zip/AsiExtraField.java | 12 ++++++++----
src/main/org/apache/tools/zip/ZipFile.java | 20 +++++++++++++++++++-
3 files changed, 32 insertions(+), 7 deletions(-)
diff --cc src/main/org/apache/tools/tar/TarInputStream.java
index 0477d5c,966835e..71e4cc0
--- a/src/main/org/apache/tools/tar/TarInputStream.java
+++ b/src/main/org/apache/tools/tar/TarInputStream.java
@@@ -448,9 -452,10 +450,10 @@@ public class TarInputStream extends Fil
+ " bytes, read "
+ got);
}
+ byte[] rest = bos.toByteArray();
// Drop trailing NL
String value = new String(rest, 0,
- restLen - 1, "UTF-8");
+ restLen - 1, StandardCharsets.UTF_8);
headers.put(keyword, value);
break;
}