refs #1620 - close stream after reading file

swagger-api · May 9, 2022 · e094c6a · e094c6a
1 parent 2409bd4
commit e094c6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/util/RefUtils.java b/modules/swagger-parser/src/main/java/io/swagger/parser/util/RefUtils.java
@@ -2,11 +2,13 @@
 
 import io.swagger.models.auth.AuthorizationValue;
 import io.swagger.models.refs.RefFormat;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
@@ -138,7 +140,9 @@ public static String readExternalRef(String file, RefFormat refFormat, List<Auth
                 final Path pathToUse = parentDirectory.resolve(file).normalize();
 
                 if(Files.exists(pathToUse)) {
-                    result = IOUtils.toString(new FileInputStream(pathToUse.toFile()), "UTF-8");
+                    try(InputStream inputStream = new FileInputStream(pathToUse.toFile())){
+                        result = IOUtils.toString(inputStream, "UTF-8");
+                    }
                 } else {
                     String url = file;
                     if(url.contains("..")) {
@@ -149,7 +153,9 @@ public static String readExternalRef(String file, RefFormat refFormat, List<Auth
                     final Path pathToUse2 = parentDirectory.resolve(url).normalize();
 
                     if(Files.exists(pathToUse2)) {
-                        result = IOUtils.toString(new FileInputStream(pathToUse2.toFile()), "UTF-8");
+                        try(InputStream inputStream = new FileInputStream(pathToUse2.toFile())){
+                            result = IOUtils.toString(inputStream, "UTF-8");
+                        }
                     }
                 }
                 if (result == null){

diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/util/RefUtilsTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/util/RefUtilsTest.java
@@ -160,6 +160,9 @@ public void testReadExternalRef_RelativeFileFormat(@Injectable final List<Author
             IOUtils.toString(fileInputStream, "UTF-8");
             times = 1;
             result = expectedResult;
+            fileInputStream.close();
+            times = 1;
+
         }};
 
         String actualResult = RefUtils.readExternalRef(filePath, RefFormat.RELATIVE, auths, parentDirectory);