You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/12/01 16:00:26 UTC
[commons-compress] branch master updated: Close File input stream after unpacking in Pack200UnpackerAdapter.unpack(File, JarOutputStream).
This is an automated email from the ASF dual-hosted git repository.
ggregory 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 bd4f5df Close File input stream after unpacking in Pack200UnpackerAdapter.unpack(File, JarOutputStream).
bd4f5df is described below
commit bd4f5dfddef32690a7169bce6a21884dba0285e7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Dec 1 11:00:21 2021 -0500
Close File input stream after unpacking in
Pack200UnpackerAdapter.unpack(File, JarOutputStream).
---
src/changes/changes.xml | 3 +++
.../commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 59d804d..5febf4e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="Gary Gregory">
Fix some compiler warnings in pack200 packages.
</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">
+ Close File input stream after unpacking in Pack200UnpackerAdapter.unpack(File, JarOutputStream).
+ </action>
<!-- ADD -->
<!-- none yet -->
<!-- UPDATE -->
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java
index af9dc6b..ea23d46 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.jar.JarOutputStream;
import org.apache.commons.compress.harmony.pack200.Pack200Adapter;
@@ -67,7 +68,8 @@ public class Pack200UnpackerAdapter extends Pack200Adapter implements Unpacker {
}
final int size = (int) file.length();
final int bufferSize = size > 0 && size < DEFAULT_BUFFER_SIZE ? size : DEFAULT_BUFFER_SIZE;
- final InputStream in = new BufferedInputStream(new FileInputStream(file), bufferSize);
- unpack(in, out);
+ try (final InputStream in = new BufferedInputStream(Files.newInputStream(file.toPath()), bufferSize)) {
+ unpack(in, out);
+ }
}
}