You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/21 22:33:09 UTC
[15/23] logging-log4j2 git commit: Close input stream when done
Close input stream when done
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a85fe0c7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a85fe0c7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a85fe0c7
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: a85fe0c73ef5d145892937f105b4b0d61e270079
Parents: 74da11e
Author: Mikael St�ldal <mi...@staldal.nu>
Authored: Sun Aug 21 12:36:46 2016 +0200
Committer: Mikael St�ldal <mi...@staldal.nu>
Committed: Sun Aug 21 12:36:46 2016 +0200
----------------------------------------------------------------------
.../org/apache/log4j/config/Log4j1ConfigurationFactory.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a85fe0c7/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
index 2ca2ac1..b1b2dfe 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import java.io.IOException;
+import java.io.InputStream;
/**
* Experimental ConfigurationFactory for Log4j 1.2 properties configuration files.
@@ -40,8 +41,8 @@ public class Log4j1ConfigurationFactory extends ConfigurationFactory {
@Override
public Configuration getConfiguration(final ConfigurationSource source) {
final ConfigurationBuilder<BuiltConfiguration> builder;
- try {
- builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(source.getInputStream());
+ try (final InputStream configStream = source.getInputStream()) {
+ builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(configStream);
} catch (IOException e) {
throw new ConfigurationException("Unable to load " + source.toString(), e);
}