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

[geirm]

geirm       00/12/06 12:49:27

  Modified:    src/java/org/apache/velocity Template.java
  Log:
  Caught NPE when template is null due to parse error (or other internal Runtime 
error...)
  
  Revision  Changes    Path
  1.17      +8 -3      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Template.java     2000/12/05 05:10:01     1.16
  +++ Template.java     2000/12/06 20:49:23     1.17
  @@ -84,7 +84,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.16 2000/12/05 05:10:01 geirm Exp $
  + * @version $Id: Template.java,v 1.17 2000/12/06 20:49:23 geirm Exp $
    */
   public class Template
   {
  @@ -279,7 +279,12 @@
       public void merge(Context context, Writer writer)
           throws IOException, Exception
       {
  -        context.setCurrentTemplateName( name );
  -        document.render(context, writer);
  +        if( document != null)
  +        {
  +            context.setCurrentTemplateName( name );
  +            document.render(context, writer);
  +        }
  +        else
  +            Runtime.error("Template.merge() failure.  The document is null, most 
likely due to parsing error.");
       }
   }