thorhauer 01/10/18 07:40:26
Modified: src/java/org/apache/turbine/services/xmlrpc/util
FileHandler.java
Log:
making sure that we close resuources when we are done
Revision Changes Path
1.2 +20 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/FileHandler.java
Index: FileHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/FileHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileHandler.java 2001/08/16 05:09:28 1.1
+++ FileHandler.java 2001/10/18 14:40:26 1.2
@@ -191,7 +191,9 @@
String file = TurbineServlet.getRealPath(
TurbineResources.getString(targetLocationProperty) +
"/" + fileName);
-
+
+ StringWriter sw = null;
+ BufferedReader reader = null;
try
{
/*
@@ -199,9 +201,10 @@
* velocity ContentResource class.
*/
- StringWriter sw = new StringWriter();
+ //StringWriter sw = new StringWriter();
+ sw = new StringWriter();
- BufferedReader reader = new BufferedReader(
+ reader = new BufferedReader(
new InputStreamReader(
new FileInputStream(file)));
@@ -222,6 +225,18 @@
return null;
}
+ finally
+ {
+ try
+ {
+ sw.close();
+ reader.close();
+ }
+ catch (Exception e)
+ {
+
+ }
+ }
}
public static boolean writeFileContents(String fileContents,
@@ -307,10 +322,9 @@
* make the application fully portable. So use the TurbineServlet
* service to map the target location in the webapp space.
*/
-
File sourceFile = new File(
- TurbineServlet.getRealPath(
- TurbineResources.getString(sourceLocationProperty) +
+ TurbineServlet.getRealPath(
+ TurbineResources.getString(sourceLocationProperty) +
"/" + sourceFileName));
if (sourceFile.exists())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
