cvs commit: jakarta-velocity/src/java/org/apache/velocity Template.java

[jvanzyl]

jvanzyl     01/01/08 07:47:00

  Modified:    src/java/org/apache/velocity Template.java
  Log:
  - committed a patch sent by Kasper Nielsen which makes sure that
    the input stream is close on a template parse error in Template.java
  
  Revision  Changes    Path
  1.21      +16 -11    jakarta-velocity/src/java/org/apache/velocity/Template.java
  
  Index: Template.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/Template.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Template.java     2001/01/03 05:15:02     1.20
  +++ Template.java     2001/01/08 15:46:54     1.21
  @@ -89,7 +89,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Template.java,v 1.20 2001/01/03 05:15:02 geirm Exp $
  + * @version $Id: Template.java,v 1.21 2001/01/08 15:46:54 jvanzyl Exp $
    */
   public class Template extends Resource
   {
  @@ -116,19 +116,24 @@
           {
               InputStream is = resourceLoader.getResourceStream(name);
           
  -            if (is != null)
  +            try
               {
  -                data = Runtime.parse(is, name);
  -                initDocument();
  -                return true;
  +                if (is != null)
  +                {
  +                    data = Runtime.parse(is, name);
  +                    initDocument();
  +                    return true;
  +                }    
  +            } 
  +            finally 
  +            {
  +                // Make sure to close the inputstream when we are done.
  +                is.close();
               }
  -            else
  -                return false;
           }
  -        catch (Exception e)
  -        {
  -            return false;
  -        }            
  +        catch (Exception ignored) {}
  +   
  +        return false;            
       }
   
       /**