velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r651710 - /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
Date Fri, 25 Apr 2008 22:04:02 GMT
Author: nbubna
Date: Fri Apr 25 15:04:01 2008
New Revision: 651710

URL: http://svn.apache.org/viewvc?rev=651710&view=rev
Log:
beware of null log

Modified:
    velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/FieldTool.java

Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/FieldTool.java?rev=651710&r1=651709&r2=651710&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/FieldTool.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/FieldTool.java Fri
Apr 25 15:04:01 2008
@@ -230,7 +230,8 @@
             if (Modifier.isStatic(mod) && Modifier.isPublic(mod))
             {
                 // make it easy to debug key collisions
-                if (log.isDebugEnabled() && results.containsKey(field.getName()))
+                if (log != null && log.isDebugEnabled() &&
+                    results.containsKey(field.getName()))
                 {
                     log.debug("FieldTool: "+field.getName()+
                               " is being overridden by "+clazz.getName());



Mime
View raw message