Author: nbubna
Date: Mon Nov 17 16:01:17 2008
New Revision: 718442
URL: http://svn.apache.org/viewvc?rev=718442&view=rev
Log:
backout a couple useless, findbugs-motivated changes
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParseException.java
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=718442&r1=718441&r2=718442&view=diff
==============================================================================
---
velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
(original)
+++
velocity/engine/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
Mon Nov 17 16:01:17 2008
@@ -697,7 +697,7 @@
* set the switch for automatic reloading of
* global library-based VMs
*/
- private synchronized void setAutoload(boolean b)
+ private void setAutoload(boolean b)
{
autoReloadLibrary = b;
}
@@ -706,7 +706,7 @@
* get the switch for automatic reloading of
* global library-based VMs
*/
- private synchronized boolean getAutoload()
+ private boolean getAutoload()
{
return autoReloadLibrary;
}
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParseException.java?rev=718442&r1=718441&r2=718442&view=diff
==============================================================================
---
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParseException.java
(original)
+++
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParseException.java
Mon Nov 17 16:01:17 2008
@@ -73,7 +73,7 @@
* this object has been created due to a parse error, the token
* followng this token will (therefore) be the first error token.
*/
- public transient Token currentToken;
+ public Token currentToken;
/**
* Each entry in this array is an array of integers. Each array