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

[jon]

jon         00/11/07 15:09:48

  Modified:    src/java/org/apache/velocity/runtime Runtime.java
  Log:
  still not pool based, but syncronized slightly better IMHO
  
  it doesn't seem to produce any MT errors.
  
  Revision  Changes    Path
  1.35      +12 -23    
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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Runtime.java      2000/11/06 21:44:03     1.34
  +++ Runtime.java      2000/11/07 23:09:45     1.35
  @@ -145,7 +145,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.34 2000/11/06 21:44:03 jon Exp $
  + * @version $Id: Runtime.java,v 1.35 2000/11/07 23:09:45 jon Exp $
    */
   public class Runtime
   {
  @@ -206,8 +206,10 @@
         * The Runtime parser. This has to be changed to
         * a pool of parsers!
         */
  -    private static Stack parserStack;
  +//    private static SimplePool parserPool;
       
  +    private static Parser parser = null;
  +    
       /**
         * Number of parsers to create
         */
  @@ -391,12 +393,14 @@
        */
       private static void initializeParserPool()
       {
  -        parserStack = new Stack();
  +        /*
  +        parserPool = new SimplePool(NUMBER_OF_PARSERS);
           for (int i=0;i<NUMBER_OF_PARSERS ;i++ )
           {
  -            parserStack.push (createNewParser());
  +            parserPool.put (createNewParser());
           }
           Runtime.info ("Created: " + NUMBER_OF_PARSERS + " parsers.");
  +        */
       }
   
       /**
  @@ -420,28 +424,13 @@
       public static SimpleNode parse(InputStream inputStream)
           throws ParseException
       {
  -        Parser parser = null;
  -        try
  +        synchronized(parser)
           {
  -            parser = (Parser) parserStack.pop();
               if (parser == null)
                   parser = createNewParser();
  -        }
  -        catch (Exception e)
  -        {
  -            parser = createNewParser();
  -        }
  -        SimpleNode sn = null;
  -        try
  -        {
  -            sn = parser.parse(inputStream);            
  -        }
  -        finally
  -        {
  -            if (parser != null)
  -                parserStack.push(parser);
  -        }
  -        return sn;
  +
  +            return parser.parse(inputStream);            
  +        } 
       }
       
       /**