Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify code with try with resources (#1017)

This commit is contained in:
Elliotte Rusty Harold 2023-02-27 07:38:19 -05:00 committed by GitHub
parent 85ac42dbd9
commit 4e098a3205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java
View File

@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.api.xml.XmlNode;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.MXParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@ -61,17 +60,12 @@ public class XmlNodeBuilder {
public static XmlNodeImpl build(InputStream is, String encoding, boolean trim)
throws XmlPullParserException, IOException {
try {
try (InputStream closeMe = is) {
final XmlPullParser parser = new MXParser();
parser.setInput(is, encoding);
final XmlNodeImpl node = build(parser, trim);
is.close();
is = null;
return node;
} finally {
IOUtil.close(is);
}
}
@ -90,17 +84,13 @@ public class XmlNodeBuilder {
*/
public static XmlNodeImpl build(Reader reader, boolean trim, InputLocationBuilder locationBuilder)
throws XmlPullParserException, IOException {
try {
try (Reader closeMe = reader) {
final XmlPullParser parser = new MXParser();
parser.setInput(reader);
final XmlNodeImpl node = build(parser, trim, locationBuilder);
reader.close();
reader = null;
return node;
} finally {
IOUtil.close(reader);
}
}