geirm 02/03/23 10:54:55
Modified: src/java/org/apache/velocity/runtime/resource
ContentResource.java
Log:
Close Reader when done. Bug #7394
Revision Changes Path
1.7 +16 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ContentResource.java
Index: ContentResource.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ContentResource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContentResource.java 22 Oct 2001 03:53:25 -0000 1.6
+++ ContentResource.java 23 Mar 2002 18:54:55 -0000 1.7
@@ -65,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
- * @version $Id: ContentResource.java,v 1.6 2001/10/22 03:53:25 jon Exp $
+ * @version $Id: ContentResource.java,v 1.7 2002/03/23 18:54:55 geirm Exp $
*/
public class ContentResource extends Resource
{
@@ -77,11 +77,13 @@
/** Pull in static content and store it */
public boolean process()
{
+ BufferedReader reader = null;
+
try
{
StringWriter sw = new StringWriter();
- BufferedReader reader = new BufferedReader(
+ reader = new BufferedReader(
new InputStreamReader(resourceLoader.getResourceStream(name),
encoding));
char buf[] = new char[1024];
@@ -98,6 +100,18 @@
{
rsvc.error("Cannot process content resource : " + e.toString() );
return false;
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch(Exception e)
+ {}
+ }
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
