Author: henning
Date: Thu Oct 12 09:15:29 2006
New Revision: 463300

URL: http://svn.apache.org/viewvc?view=rev&rev=463300
Log:
Moved to a saner properties retrieval.

Modified:
    
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java

Modified: 
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
URL: 
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java?view=diff&rev=463300&r1=463299&r2=463300
==============================================================================
--- 
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
 (original)
+++ 
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
 Thu Oct 12 09:15:29 2006
@@ -99,20 +99,10 @@
             Priority level = null;
             if (rsvc != null)
             {
-                format = (String) rsvc.getProperty(AVALON_LOGGER_FORMAT);
-                level = (Priority) 
logLevels.get(rsvc.getProperty(AVALON_LOGGER_LEVEL));
+                format = rsvc.getString(AVALON_LOGGER_FORMAT, "%{time} 
%{message}\\n%{throwable}");
+                level = (Priority) 
logLevels.get(rsvc.getString(AVALON_LOGGER_LEVEL, "debug"));
             }
 
-            if (StringUtils.isEmpty(format))
-            {
-                format = "%{time} %{message}\\n%{throwable}";
-            }
-            
-            if (level == null)
-            {
-                level = Priority.DEBUG;
-            }
-                
             VelocityFormatter vf = new VelocityFormatter(format);
 
             // make the target and keep the default behavior of not appending



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to