Always close InputStreams

adobe · Dec 18, 2024 · 19894bf · 19894bf
1 parent b696f08
commit 19894bf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java b/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java
@@ -99,7 +99,6 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.BoundedInputStream;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRange;
@@ -785,7 +784,13 @@ private static void extractBytesToOutputStream(HttpRange range, S3ObjectMetadata
     try (var fis = Files.newInputStream(s3ObjectMetadata.dataPath())) {
       var skip = fis.skip(range.getRangeStart(fileSize));
       if (skip == range.getRangeStart(fileSize)) {
-        IOUtils.copy(new BoundedInputStream(fis, bytesToRead), outputStream);
+        try (var bis = BoundedInputStream
+            .builder()
+            .setInputStream(fis)
+            .setMaxCount(bytesToRead)
+            .get()) {
+          bis.transferTo(outputStream);
+        }
       } else {
         throw new IllegalStateException("Could not skip exact byte range");
       }

diff --git a/server/src/main/java/com/adobe/testing/s3mock/service/ServiceBase.java b/server/src/main/java/com/adobe/testing/s3mock/service/ServiceBase.java
@@ -58,8 +58,8 @@ public void verifyChecksum(Path path, String checksum, ChecksumAlgorithm checksu
   public Pair<Path, String> toTempFile(InputStream inputStream, HttpHeaders httpHeaders) {
     try {
       var tempFile = Files.createTempFile("ObjectService", "toTempFile");
-      try (OutputStream os = Files.newOutputStream(tempFile)) {
-        InputStream wrappedStream = wrapStream(inputStream, httpHeaders);
+      try (OutputStream os = Files.newOutputStream(tempFile);
+          InputStream wrappedStream = wrapStream(inputStream, httpHeaders)) {
         wrappedStream.transferTo(os);
         ChecksumAlgorithm algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
         if (algorithmFromSdk != null

diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java b/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java
@@ -50,7 +50,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.StreamSupport;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.BoundedInputStream;
 import org.apache.commons.lang3.stream.Streams;
 import org.slf4j.Logger;
@@ -381,13 +380,13 @@ private String copyPartToFile(BucketMetadata bucket,
         var targetStream = newOutputStream(partFile.toPath())) {
       var skip = sourceStream.skip(from);
       if (skip == from) {
-        IOUtils.copy(BoundedInputStream
+        try (var bis = BoundedInputStream
             .builder()
             .setInputStream(sourceStream)
             .setMaxCount(len)
-            .get(),
-            targetStream
-        );
+            .get()) {
+          bis.transferTo(targetStream);
+        }
       } else {
         throw new IllegalStateException("Could not skip exact byte range");
       }