Author: felixk
Date: Wed Sep 7 10:05:20 2011
New Revision: 1166093
URL: http://svn.apache.org/viewvc?rev=1166093&view=rev
Log:
Close inputstream (JAMES-1207)
Modified:
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
Modified:
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java?rev=1166093&r1=1166092&r2=1166093&view=diff
==============================================================================
---
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
(original)
+++
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
Wed Sep 7 10:05:20 2011
@@ -36,6 +36,7 @@ public class OSGIConfigurationProvider i
@Override
public HierarchicalConfiguration getConfiguration(String beanName) throws
ConfigurationException {
XMLConfiguration config = new XMLConfiguration();
+ FileInputStream fis = null;
config.setDelimiterParsingDisabled(true);
// Don't split attributes which can have bad side-effects with
matcher-conditions.
@@ -45,9 +46,18 @@ public class OSGIConfigurationProvider i
// Use InputStream so we are not bound to File implementations of the
// config
try {
- config.load(new FileInputStream("/tmp/" + beanName + ".xml"));
+ fis = new FileInputStream("/tmp/" + beanName + ".xml");
+ config.load(fis);
} catch (FileNotFoundException e) {
throw new ConfigurationException("Bean " + beanName);
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (Exception e) {
+ // Left empty on purpose
+ }
+ }
}
return config;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
