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 2018/05/07 17:51:17 UTC

[1/2] commons-compress git commit: add another constructor overload without password

Repository: commons-compress
Updated Branches:
  refs/heads/COMPRESS-452 aa7ff9805 -> 722cf7444


add another constructor overload without password


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

Branch: refs/heads/COMPRESS-452
Commit: 8040ea3db6f813afe6e83c935ed33e5c65966a60
Parents: aa7ff98
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon May 7 19:49:44 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon May 7 19:49:44 2018 +0200

----------------------------------------------------------------------
 .../compress/archivers/sevenz/SevenZFile.java      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/8040ea3d/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
----------------------------------------------------------------------
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 902174c..8ce3e39 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
@@ -186,6 +186,23 @@ public class SevenZFile implements Closeable {
      * allows you to read from an in-memory archive.</p>
      *
      * @param channel the channel to read
+     * @param filename name of the archive - only used for error reporting
+     * @throws IOException if reading the archive fails
+     * @since 1.17
+     */
+    public SevenZFile(final SeekableByteChannel channel, String filename)
+        throws IOException {
+        this(channel, filename, null, false);
+    }
+
+    /**
+     * Reads a SeekableByteChannel as 7z archive
+     *
+     * <p>{@link
+     * org.apache.commons.compress.utils.SeekableInMemoryByteChannel}
+     * allows you to read from an in-memory archive.</p>
+     *
+     * @param channel the channel to read
      * @param password optional password if the archive is encrypted -
      * the byte array is supposed to be the UTF16-LE encoded
      * representation of the password.


[2/2] commons-compress git commit: char[] overloads don't need to talk about encoding

Posted by bo...@apache.org.
char[] overloads don't need to talk about encoding


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

Branch: refs/heads/COMPRESS-452
Commit: 722cf7444bf541214f91111f5909515592439569
Parents: 8040ea3
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon May 7 19:50:54 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon May 7 19:50:54 2018 +0200

----------------------------------------------------------------------
 .../apache/commons/compress/archivers/sevenz/SevenZFile.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/722cf744/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
----------------------------------------------------------------------
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 8ce3e39..421c34a 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
@@ -147,9 +147,7 @@ public class SevenZFile implements Closeable {
      * allows you to read from an in-memory archive.</p>
      *
      * @param channel the channel to read
-     * @param password optional password if the archive is encrypted -
-     * the byte array is supposed to be the UTF16-LE encoded
-     * representation of the password.
+     * @param password optional password if the archive is encrypted
      * @throws IOException if reading the archive fails
      * @since 1.17
      */
@@ -167,9 +165,7 @@ public class SevenZFile implements Closeable {
      *
      * @param channel the channel to read
      * @param filename name of the archive - only used for error reporting
-     * @param password optional password if the archive is encrypted -
-     * the byte array is supposed to be the UTF16-LE encoded
-     * representation of the password.
+     * @param password optional password if the archive is encrypted
      * @throws IOException if reading the archive fails
      * @since 1.17
      */