try-with-resources

src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java

@@ -130,10 +130,8 @@ public class DirectoryIterator implements ClassFileIterator {
                     } else {
 
                         // we have a file. create a stream for it
-                        FileInputStream inFileStream
-                            = new FileInputStream(element);
-
-                        try {
+                        try (FileInputStream inFileStream
+                             = new FileInputStream(element)) {
                             if (element.getName().endsWith(".class")) {
 
                                 // create a data input stream from the jar
@@ -144,8 +142,6 @@ public class DirectoryIterator implements ClassFileIterator {
 
                                 nextElement = javaClass;
                             }
-                        } finally {
-                            inFileStream.close();
                         }
                     }
                 } else {

src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java

@@ -222,8 +222,7 @@ public class jlink {
         if (!f.exists()) {
             return;
         }
-        ZipFile zipf = new ZipFile(f);
-        try {
+        try (ZipFile zipf = new ZipFile(f)) {
             Enumeration entries = zipf.entries();
 
             while (entries.hasMoreElements()) {
@@ -268,8 +267,6 @@ public class jlink {
                     output.closeEntry();
                 }
             }
-        } finally {
-            zipf.close();
         }
     }
 

src/main/org/apache/tools/ant/types/resources/ResourceList.java

@@ -196,16 +196,13 @@ public class ResourceList extends DataType implements ResourceCollection {
             crh.setFilterChains(filterChains);
             crh.setProject(getProject());
             Union streamResources = new Union();
-            BufferedReader reader = new BufferedReader(crh.getAssembledReader());
-            try {
+            try (BufferedReader reader = new BufferedReader(crh.getAssembledReader())) {
                 streamResources.setCache(true);
 
                 String line = null;
                 while ((line = reader.readLine()) != null) {
                     streamResources.add(parse(line));
                 }
-            } finally {
-                reader.close();
             }
 
             return streamResources;