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

[geirm]

geirm       00/11/12 09:58:20

  Modified:    src/java/org/apache/velocity/runtime Runtime.java
  Log:
  Removed protection around parser.parse() (not necessary because of Jasons protected 
pool) and put check to ensure we don't run out..
  
  Revision  Changes    Path
  1.40      +13 -6     
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
  
  Index: Runtime.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- Runtime.java      2000/11/12 16:21:35     1.39
  +++ Runtime.java      2000/11/12 17:58:20     1.40
  @@ -146,7 +146,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
  - * @version $Id: Runtime.java,v 1.39 2000/11/12 16:21:35 jvanzyl Exp $
  + * @version $Id: Runtime.java,v 1.40 2000/11/12 17:58:20 geirm Exp $
    */
   public class Runtime
   {
  @@ -211,6 +211,8 @@
       
       //private static Parser parser = null;
       
  +       private static  Object stupidObject = null;
  +
       /**
         * Number of parsers to create
         */
  @@ -274,6 +276,9 @@
               // Do Default
               setDefaultProperties();
           }
  +
  +        stupidObject = new Object();
  +
           init();
       }
   
  @@ -429,14 +434,16 @@
           SimpleNode AST = null;
           Parser parser = (Parser) parserPool.get();
           
  -        synchronized(parser)
  +        if (parser != null)
           {
               AST = parser.parse(inputStream);
  +            parserPool.put(parser);
  +            return AST;
           }
  -        
  -        parserPool.put(parser);
  -        
  -        return AST;
  +        else
  +            error("Runtime : ran out of parsers!");
  +
  +        return null;
       }
       
       /**