Author: henning
Date: Sat Oct 1 05:00:13 2005
New Revision: 292963
URL: http://svn.apache.org/viewcvs?rev=292963&view=rev
Log:
Removed a possible NPE when rsvc.getProperty might decide to return
neither a String nor a List.
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java?rev=292963&r1=292962&r2=292963&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
Sat Oct 1 05:00:13 2005
@@ -98,7 +98,7 @@
* AvalonLogChute, the Log4JLogChute, and the JdkLogChute for
* convenience - so we use whichever we find first.
*/
- List classes = null;
+ List classes = new ArrayList();
Object obj = rsvc.getProperty(
RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS );
/*
@@ -110,7 +110,6 @@
}
else if ( obj instanceof String)
{
- classes = new ArrayList();
classes.add( obj );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
