svn commit: r1543684 - /incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/FileConfigurationProvider.java

[ol...@apache.org]

Author: olamy
Date: Wed Nov 20 01:00:05 2013
New Revision: 1543684

URL: http://svn.apache.org/r1543684
Log:
correctly close inputstream

Modified:
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/FileConfigurationProvider.java

Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/FileConfigurationProvider.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/FileConfigurationProvider.java?rev=1543684&r1=1543683&r2=1543684&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/FileConfigurationProvider.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/FileConfigurationProvider.java Wed Nov 20 01:00:05 2013
@@ -43,10 +43,14 @@ public class FileConfigurationProvider i
         final Properties properties = new Properties();
         final String filename = System.getProperty(Configuration.CONFIG_PROPERTY_PREFIX + "configuration." + name, name);
         if (new File(filename).exists()) {
+            FileInputStream fileInputStream = null;
             try {
-                properties.load(new FileInputStream(filename));
+                fileInputStream = new FileInputStream(filename);
+                properties.load(fileInputStream);
             } catch (final IOException e) {
                 LOGGER.log(Level.SEVERE, e.getMessage(), e);
+            } finally {
+              closeQuietly( fileInputStream );
             }
         } else {
             // use core classloader and not TCCL to avoid to use app loader to load config
@@ -61,4 +65,14 @@ public class FileConfigurationProvider i
         }
         return properties;
     }
+
+    private void closeQuietly(InputStream inputStream) {
+        try {
+            if (inputStream != null) {
+                inputStream.close();
+            }
+        } catch ( IOException e ) {
+            LOGGER.log(Level.WARNING, "fail to close inputStream: " + e.getMessage(), e);
+        }
+    }
 }