Skip to content

Commit 027b5da

Browse files
committed
Close stream on exception path too
1 parent fc18a7a commit 027b5da

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

utilcode/src/main/java/com/blankj/utilcode/utils/SDCardUtils.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.io.File;
77
import java.io.FileInputStream;
88
import java.io.FileOutputStream;
9+
import java.io.IOException;
910

1011
/**
1112
* <pre>
@@ -138,17 +139,23 @@ public static boolean saveFileToSDCard(String filePath, String filename, String
138139
*/
139140
public static byte[] readFileFromSDCard(String filePath, String fileName) {
140141
byte[] buffer = null;
142+
FileInputStream fin = null;
141143
try {
142144
if (isSDCardEnable()) {
143145
String filePaht = filePath + "/" + fileName;
144-
FileInputStream fin = new FileInputStream(filePaht);
146+
fin = new FileInputStream(filePaht);
145147
int length = fin.available();
146148
buffer = new byte[length];
147149
fin.read(buffer);
148-
fin.close();
149150
}
150151
} catch (Exception e) {
151152
e.printStackTrace();
153+
} finally {
154+
try {
155+
if (fin != null) fin.close();
156+
} catch (IOException e) {
157+
e.printStackTrace();
158+
}
152159
}
153160
return buffer;
154161
}

0 commit comments

Comments
 (0)