You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/12/20 19:52:55 UTC
[5/6] ant git commit: try-with-resources
try-with-resources
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/851a0b20
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/851a0b20
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/851a0b20
Branch: refs/heads/master
Commit: 851a0b208613f7b15816adb6acb799dddd95fb69
Parents: 89b267e
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 20 20:52:17 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 20 20:52:17 2016 +0100
----------------------------------------------------------------------
.../ant/taskdefs/optional/depend/DirectoryIterator.java | 8 ++------
.../org/apache/tools/ant/taskdefs/optional/jlink/jlink.java | 5 +----
.../org/apache/tools/ant/types/resources/ResourceList.java | 5 +----
3 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/851a0b20/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
index af28c96..fbb963e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
+++ b/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 {
http://git-wip-us.apache.org/repos/asf/ant/blob/851a0b20/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
index b2c5d0f..aa193ea 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
+++ b/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();
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/851a0b20/src/main/org/apache/tools/ant/types/resources/ResourceList.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceList.java b/src/main/org/apache/tools/ant/types/resources/ResourceList.java
index da83ea9..fbb226c 100644
--- a/src/main/org/apache/tools/ant/types/resources/ResourceList.java
+++ b/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;