Author: henning
Date: Sat Oct 1 05:40:06 2005
New Revision: 292975
URL: http://svn.apache.org/viewcvs?rev=292975&view=rev
Log:
fixup incomplete field synchronization. Also make inner class static
(does not need 'this').
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=292975&r1=292974&r2=292975&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
Sat Oct 1 05:40:06 2005
@@ -383,7 +383,7 @@
* @param sourceTemplate Source template that contains the defintion of
the VM
* @return true if it is allowed to be added, false otherwise
*/
- private boolean canAddVelocimacro( String name, String sourceTemplate)
+ private synchronized boolean canAddVelocimacro( String name, String
sourceTemplate)
{
/*
* short circuit and do it if autoloader is on, and the
@@ -677,7 +677,7 @@
* recursive reload due to inter-calling
* VMs in a library
*/
- private class Twonk
+ private static class Twonk
{
public Template template;
public long modificationTime;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
