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

[jvanzyl]

jvanzyl     00/10/09 20:33:06

  Modified:    src/java/org/apache/velocity/runtime/loader
                        FileTemplateLoader.java
  Log:
  - got rid of sync'd blocks around hashtable, get/remove are
    already synchronized.
  
  Revision  Changes    Path
  1.5       +3 -9      
jakarta-velocity/src/java/org/apache/velocity/runtime/loader/FileTemplateLoader.java
  
  Index: FileTemplateLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/loader/FileTemplateLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FileTemplateLoader.java   2000/10/09 18:57:18     1.4
  +++ FileTemplateLoader.java   2000/10/10 03:33:05     1.5
  @@ -70,7 +70,7 @@
    * That'll change once we decide how we want to do configuration
    * 
    * @author Dave Bryson
  - * $Revision: 1.4 $
  + * $Revision: 1.5 $
    */
   public class FileTemplateLoader extends TemplateLoader
   {
  @@ -123,10 +123,7 @@
                       //remove from cache
                       ct.setFile( null );
                       ct.setTemplate( null );
  -                    synchronized( cache )
  -                    {
  -                        cache.remove( name );
  -                    }
  +                    cache.remove( name );
                   }
                       
               }
  @@ -144,10 +141,7 @@
                   CachedTemplate cacheit = new CachedTemplate( file );
                   cacheit.setTemplate( template );
                   cacheit.setInterval( checkInterval );
  -                synchronized( cache )
  -                {
  -                    cache.put( name, cacheit );
  -                }
  +                cache.put( name, cacheit );
               }
               return template;
           }