From 36a2aa8c1ade76d25946af4f4cadbd4d4c6bd7fc Mon Sep 17 00:00:00 2001
From: Lanchon <lanchon@gmail.com>
Date: Fri, 22 Sep 2017 21:54:03 -0300
Subject: [PATCH] Use try-with-resources

---
 src/main/java/lanchon/multidexlib2/RawDexIO.java       |  5 +----
 .../java/lanchon/multidexlib2/ZipFileDexContainer.java | 10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/java/lanchon/multidexlib2/RawDexIO.java b/src/main/java/lanchon/multidexlib2/RawDexIO.java
index 25c0b4c..4a9d3a4 100644
--- a/src/main/java/lanchon/multidexlib2/RawDexIO.java
+++ b/src/main/java/lanchon/multidexlib2/RawDexIO.java
@@ -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);
diff --git a/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java b/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java
index 18c5eca..8ae76ab 100644
--- a/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java
+++ b/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java
@@ -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);
 	}