Author: henning
Date: Sat Oct 1 05:37:24 2005
New Revision: 292973
URL: http://svn.apache.org/viewcvs?rev=292973&view=rev
Log:
Don't leave fields uninitialized (found by findbugs)
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java?rev=292973&r1=292972&r2=292973&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
Sat Oct 1 05:37:24 2005
@@ -41,7 +41,7 @@
private static final String DEFAULT_NOT_FOUND = "notfound.vm";
private static final String PROPERTY_NOT_FOUND =
"eventhandler.include.notfound";
- private RuntimeServices rs;
+ private RuntimeServices rs = null;
String notfound;
/**
@@ -82,7 +82,7 @@
public void setRuntimeServices(RuntimeServices rs) throws Exception
{
this.rs = rs;
- notfound = rs.getString(PROPERTY_NOT_FOUND,DEFAULT_NOT_FOUND).trim();
+ notfound = rs.getString(PROPERTY_NOT_FOUND, DEFAULT_NOT_FOUND).trim();
}
}
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java?rev=292973&r1=292972&r2=292973&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
Sat Oct 1 05:37:24 2005
@@ -43,7 +43,7 @@
*/
public class ASTDirective extends SimpleNode
{
- private Directive directive;
+ private Directive directive = null;
private String directiveName = "";
private boolean isDirective;
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java?rev=292973&r1=292972&r2=292973&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
Sat Oct 1 05:37:24 2005
@@ -35,8 +35,8 @@
public class ASTSetDirective extends SimpleNode
{
private String leftReference = "";
- private Node right;
- private ASTReference left;
+ private Node right = null;
+ private ASTReference left = null;
boolean blather = false;
public ASTSetDirective(int id)
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java?rev=292973&r1=292972&r2=292973&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Sat Oct 1 05:37:24 2005
@@ -46,7 +46,7 @@
/**
* The paths to search for templates.
*/
- private List paths;
+ private List paths = new ArrayList();
/**
* Used to map the path that a template was found on
@@ -54,20 +54,14 @@
* times of the files. This is synchronizedMap
* instance.
*/
- private Map templatePaths;
+ private Map templatePaths = Collections.synchronizedMap(new HashMap());
public void init( ExtendedProperties configuration)
{
log.info("FileResourceLoader : initialization starting.");
- paths = new ArrayList();
paths.addAll( configuration.getVector("path") );
-
- /**
- * Create synchronized map instance
- */
- templatePaths = Collections.synchronizedMap(new HashMap());
-
+
if (log.isInfoEnabled())
{
// this section lets tell people what paths we will be using
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
