svn commit: r666913 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java

[mbenson]

Author: mbenson
Date: Wed Jun 11 16:54:35 2008
New Revision: 666913

URL: http://svn.apache.org/viewvc?rev=666913&view=rev
Log:
catch IOExceptions reading resources

Modified:
    
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java

Modified: 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java?rev=666913&r1=666912&r2=666913&view=diff
==============================================================================
--- 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java
 (original)
+++ 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContextFactory.java
 Wed Jun 11 16:54:35 2008
@@ -19,6 +19,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Properties;
@@ -189,7 +190,18 @@
             File f = new File(configFile);
             if (f.exists()) {
                 Properties props = new Properties();
-                props.load(new FileInputStream(f));
+                FileInputStream fis = new FileInputStream(f);
+                try {
+                    props.load(fis);
+                } finally {
+                    if (fis != null) {
+                        try {
+                            fis.close();
+                        } catch (IOException e) {
+                            //swallow
+                        }
+                    }
+                }
                 String factory = props.getProperty(property);
                 if (factory != null) {
                     if (debug) {
@@ -225,8 +237,16 @@
                 BufferedReader rd =
                     new BufferedReader(new InputStreamReader(is));
 
-                String factory = rd.readLine();
-                rd.close();
+                String factory = null;
+                try {
+                    factory = rd.readLine();
+                } finally {
+                    try {
+                        rd.close();
+                    } catch (IOException e) {
+                        //swallow
+                    }
+                }
 
                 if (factory != null && !"".equals(factory)) {
                     if (debug) {
@@ -242,7 +262,6 @@
                 ex.printStackTrace();
             }
         }
-
         return defaultFactory;
     }
 }