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

[jvanzyl]

jvanzyl     00/10/15 16:19:02

  Modified:    src/java/org/apache/velocity/servlet VelocityServlet.java
  Log:
  - moved getting of defaultContext type to post Runtime.init().
  
  Revision  Changes    Path
  1.9       +5 -3      
jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java
  
  Index: VelocityServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- VelocityServlet.java      2000/10/15 22:57:04     1.8
  +++ VelocityServlet.java      2000/10/15 23:19:01     1.9
  @@ -93,7 +93,7 @@
    *
    * @author Dave Bryson
    * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
  - * $Id: VelocityServlet.java,v 1.8 2000/10/15 22:57:04 dlr Exp $
  + * $Id: VelocityServlet.java,v 1.9 2000/10/15 23:19:01 jvanzyl Exp $
    */
   public abstract class VelocityServlet extends HttpServlet
   {
  @@ -126,8 +126,7 @@
       /**
        * The default content type.
        */
  -    private static String defaultContentType = 
  -        Runtime.getString(Runtime.DEFAULT_CONTENT_TYPE, "text/html");
  +    private static String defaultContentType;
   
       /** 
        * Performs initialization of this servlet.  Called by the servlet 
  @@ -146,6 +145,9 @@
           try
           {
               Runtime.init(propsFile);
  +            
  +            defaultContentType = 
  +                Runtime.getString(Runtime.DEFAULT_CONTENT_TYPE, "text/html");
               
               encoding = Runtime.getString(Runtime.TEMPLATE_ENCODING);
               asciiHack = Runtime.getBoolean(Runtime.TEMPLATE_ASCIIHACK);