Bug 48588: DOMConfigurator does not close input stream when configure…

…d based on URL. git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/trunk@956283 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 19, 2010 · 25586dc · 25586dc
1 parent 034e6e4
commit 25586dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -22,7 +22,8 @@
   <body>
     <release version="1.2.17" date="2010-06-99" description="Maintenance release">
        <action issue="49470">log4j 1.2.17 release preparation</action>
-       <action issue="43282">Eliminate duplicates in OSGi Import-Package directive.</action>
+       <action issue="43282" action="fix">Eliminate duplicates in OSGi Import-Package directive.</action>
+       <action issue="48588" action="fix">DOMConfigurator does not close input stream when configured based on URL.</action>
     </release>
 
     <release version="1.2.16" date="2010-04-06" description="Maintenance release">

diff --git a/src/main/java/org/apache/log4j/xml/DOMConfigurator.java b/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
@@ -762,9 +762,14 @@ void doConfigure(final URL url, LoggerRepository repository) {
           public Document parse(final DocumentBuilder parser) throws SAXException, IOException {
               URLConnection uConn = url.openConnection();
               uConn.setUseCaches(false);
-              InputSource src = new InputSource(uConn.getInputStream());
-              src.setSystemId(url.toString());
-              return parser.parse(src);
+              InputStream stream = uConn.getInputStream();
+              try {
+                InputSource src = new InputSource(stream);
+                src.setSystemId(url.toString());
+                return parser.parse(src);
+              } finally {
+                stream.close();
+              }
           }
           public String toString() { 
               return "url [" + url.toString() + "]";