[maven] branch master updated: Fix callee closing streams and readers instead of callers (#1043)

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new bb02d120a Fix callee closing streams and readers instead of callers 
(#1043)
bb02d120a is described below

commit bb02d120a1ae4fc06eb40e1c5e52d039a31522c4
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Mar 9 16:28:10 2023 +0100

    Fix callee closing streams and readers instead of callers (#1043)
    
    For compatibility reason, the Xpp3DomBuilder will close those
---
 .../apache/maven/internal/xml/XmlNodeBuilder.java  | 24 ++++++++--------------
 .../codehaus/plexus/util/xml/Xpp3DomBuilder.java   | 10 ++++++---
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git 
a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java
 
b/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java
index 92b0918ab..90b185d72 100644
--- 
a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java
+++ 
b/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java
@@ -32,7 +32,8 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParser;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
- *
+ * All methods in this class attempt to fully parse the XML.
+ * The caller is responsible for closing {@code InputStream} and {@code 
Reader} arguments.
  */
 public class XmlNodeBuilder {
     private static final boolean DEFAULT_TRIM = true;
@@ -60,13 +61,9 @@ public class XmlNodeBuilder {
 
     public static XmlNodeImpl build(InputStream is, String encoding, boolean 
trim)
             throws XmlPullParserException, IOException {
-        try (InputStream closeMe = is) {
-            final XmlPullParser parser = new MXParser();
-            parser.setInput(is, encoding);
-
-            final XmlNodeImpl node = build(parser, trim);
-            return node;
-        }
+        XmlPullParser parser = new MXParser();
+        parser.setInput(is, encoding);
+        return build(parser, trim);
     }
 
     public static XmlNodeImpl build(Reader reader, boolean trim) throws 
XmlPullParserException, IOException {
@@ -84,14 +81,9 @@ public class XmlNodeBuilder {
      */
     public static XmlNodeImpl build(Reader reader, boolean trim, 
InputLocationBuilder locationBuilder)
             throws XmlPullParserException, IOException {
-        try (Reader closeMe = reader) {
-            final XmlPullParser parser = new MXParser();
-            parser.setInput(reader);
-
-            final XmlNodeImpl node = build(parser, trim, locationBuilder);
-
-            return node;
-        }
+        XmlPullParser parser = new MXParser();
+        parser.setInput(reader);
+        return build(parser, trim, locationBuilder);
     }
 
     public static XmlNodeImpl build(XmlPullParser parser) throws 
XmlPullParserException, IOException {
diff --git 
a/maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java 
b/maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
index 3d6c99ff5..8bd06991f 100644
--- 
a/maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
+++ 
b/maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
@@ -50,7 +50,9 @@ public class Xpp3DomBuilder {
 
     public static Xpp3Dom build(InputStream is, String encoding, boolean trim)
             throws XmlPullParserException, IOException {
-        return new Xpp3Dom(XmlNodeBuilder.build(is, encoding, trim));
+        try (InputStream closeMe = is) {
+            return new Xpp3Dom(XmlNodeBuilder.build(is, encoding, trim));
+        }
     }
 
     public static Xpp3Dom build(Reader reader, boolean trim) throws 
XmlPullParserException, IOException {
@@ -62,8 +64,10 @@ public class Xpp3DomBuilder {
      */
     public static Xpp3Dom build(Reader reader, boolean trim, 
InputLocationBuilder locationBuilder)
             throws XmlPullParserException, IOException {
-        return new Xpp3Dom(
-                XmlNodeBuilder.build(reader, trim, locationBuilder != null ? 
locationBuilder::toInputLocation : null));
+        try (Reader closeMe = reader) {
+            return new Xpp3Dom(XmlNodeBuilder.build(
+                    reader, trim, locationBuilder != null ? 
locationBuilder::toInputLocation : null));
+        }
     }
 
     public static Xpp3Dom build(XmlPullParser parser) throws 
XmlPullParserException, IOException {