[WIP] Prevent premature closure of input streams

Oops, we missed this difference from e0a4a11
andrebrait · May 18, 2024 · a0f8dc4 · a0f8dc4
1 parent b234f4d
commit a0f8dc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...ain/java/io/github/datromtool/io/copy/archive/impl/SevenZipArchiveSourceInternalSpec.java b/...ain/java/io/github/datromtool/io/copy/archive/impl/SevenZipArchiveSourceInternalSpec.java
@@ -49,7 +49,9 @@ public FileTimes getFileTimes() {
     @Override
     public InputStream getInputStream() {
         if (inputStream == null) {
-            inputStream = new BoundedInputStream(new SevenZFileInputStream(sevenZFile), sevenZArchiveEntry.getSize());
+            BoundedInputStream boundedInputStream = new BoundedInputStream(new SevenZFileInputStream(sevenZFile), sevenZArchiveEntry.getSize());
+            boundedInputStream.setPropagateClose(false);
+            inputStream = boundedInputStream;
         }
         return inputStream;
     }

diff --git a/...src/main/java/io/github/datromtool/io/copy/archive/impl/TarArchiveSourceInternalSpec.java b/...src/main/java/io/github/datromtool/io/copy/archive/impl/TarArchiveSourceInternalSpec.java
@@ -76,7 +76,9 @@ private static FileTime fromEpochSeconds(@Nullable String seconds, @Nullable Dat
     @Override
     public InputStream getInputStream() {
         if (inputStream == null) {
-            inputStream = new BoundedInputStream(tarArchiveInputStream, tarArchiveEntry.getRealSize());
+            BoundedInputStream boundedInputStream = new BoundedInputStream(tarArchiveInputStream, tarArchiveEntry.getRealSize());
+            boundedInputStream.setPropagateClose(false);
+            inputStream = boundedInputStream;
         }
         return inputStream;
     }

diff --git a/...a/io/github/datromtool/io/copy/archive/impl/process/ProcessArchiveSourceInternalSpec.java b/...a/io/github/datromtool/io/copy/archive/impl/process/ProcessArchiveSourceInternalSpec.java
@@ -46,7 +46,9 @@ public FileTimes getFileTimes() {
     @Override
     public InputStream getInputStream() {
         if (inputStream == null) {
-            inputStream = new BoundedInputStream(processInputStream, file.getSize());
+            BoundedInputStream boundedInputStream = new BoundedInputStream(processInputStream, file.getSize());
+            boundedInputStream.setPropagateClose(false);
+            inputStream = boundedInputStream;
         }
         return inputStream;
     }