Use try-with-resources

This commit is contained in:
Lanchon 2017-09-22 21:54:03 -03:00
parent f59046497d
commit 36a2aa8c1a
2 changed files with 3 additions and 12 deletions

View File

@ -38,11 +38,8 @@ public class RawDexIO {
public static DexBackedDexFile readRawDexFile(File file, Opcodes opcodes) throws IOException {
/*
InputStream inputStream = new FileInputStream(file);
try {
try (InputStream inputStream = new FileInputStream(file)) {
return readRawDexFile(inputStream, file.length(), opcodes);
} finally {
inputStream.close();
}
*/
byte[] buf = Files.toByteArray(file);

View File

@ -37,27 +37,21 @@ public class ZipFileDexContainer extends AbstractMultiDexContainer<WrappingMulti
public ZipFileDexContainer(File zip, DexFileNamer namer, Opcodes opcodes) throws IOException {
Map<String, WrappingMultiDexFile<DexBackedDexFile>> entryMap = new TreeMap<>(new DexFileNameComparator(namer));
ZipFile zipFile = new ZipFile(zip);
try {
try (ZipFile zipFile = new ZipFile(zip)) {
Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
while (zipEntries.hasMoreElements()) {
ZipEntry zipEntry = zipEntries.nextElement();
String entryName = zipEntry.getName();
if (namer.isValidName(entryName)) {
DexBackedDexFile dexFile;
InputStream inputStream = zipFile.getInputStream(zipEntry);
try {
try (InputStream inputStream = zipFile.getInputStream(zipEntry)) {
dexFile = RawDexIO.readRawDexFile(inputStream, zipEntry.getSize(), opcodes);
} finally {
inputStream.close();
}
WrappingMultiDexFile<DexBackedDexFile> multiDexFile =
new BasicMultiDexFile<>(this, entryName, dexFile);
if (entryMap.put(entryName, multiDexFile) != null) throwDuplicateEntryName(entryName);
}
}
} finally {
zipFile.close();
}
initialize(entryMap, opcodes);
}