Author: carnold
Date: Sat Jun 19 20:10:16 2010
New Revision: 956283
URL: http://svn.apache.org/viewvc?rev=956283&view=rev
Log:
Bug 48588: DOMConfigurator does not close input stream when configured based on
URL.
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=956283&r1=956282&r2=956283&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Sat Jun 19 20:10:16 2010
@@ -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">
Modified:
logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java?rev=956283&r1=956282&r2=956283&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
(original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
Sat Jun 19 20:10:16 2010
@@ -762,9 +762,14 @@ public class DOMConfigurator implements
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() + "]";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
