[cvs] expresso commit by lhamel: close stream after parsing URL
JCorporate Ltd
jcorp at jcorporate.com
Sat Jan 29 23:25:42 UTC 2005
Log Message:
-----------
close stream after parsing URL
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/digester:
ExpressoServicesConfig.java
Revision Data
-------------
Index: ExpressoServicesConfig.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/digester/ExpressoServicesConfig.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/digester/ExpressoServicesConfig.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/digester/ExpressoServicesConfig.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/digester/ExpressoServicesConfig.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/digester/ExpressoServicesConfig.java
@@ -72,6 +72,7 @@
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -140,6 +141,7 @@
* get the results of the Digesting of the configuration file.
*/
public void loadExpressoServices() {
+ InputStream is = null;
try {
javax.xml.parsers.SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance();
javax.xml.parsers.SAXParser sp = spf.newSAXParser();
@@ -156,11 +158,8 @@
"expresso-services_5_1.dtd in component package");
}
-
setDigesterRules(digester);
- InputStream is;
-
if (fileName != null) {
File f = new File(fileName);
is = new FileInputStream(f);
@@ -179,6 +178,14 @@
log.error("Fatal error trying to find a suitable Digester compatible parser.", ex);
} catch (java.io.IOException ex) {
log.error("Fatal IO error parsing input.", ex);
+ } finally {
+ if ( is != null ) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ log.error("Fatal file closing error:", e);
+ }
+ }
}
}
More information about the cvs
mailing list