You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2005/10/01 15:00:43 UTC

svn commit: r292979 - /jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java

Author: henning
Date: Sat Oct  1 06:00:40 2005
New Revision: 292979

URL: http://svn.apache.org/viewcvs?rev=292979&view=rev
Log:
Defuse potential NPE. (findbugs)

Modified:
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java?rev=292979&r1=292978&r2=292979&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java Sat Oct  1 06:00:40 2005
@@ -306,13 +306,14 @@
                 }
             }
 
-            Iterator j = source.getKeys();
-
-            while (j.hasNext())
+            if (source != null)
             {
-                String name = (String) j.next();
-                String value = source.getString(name);
-                contextProperties.setProperty(name,value);
+                for (Iterator j = source.getKeys(); j.hasNext(); )
+                {
+                    String name = (String) j.next();
+                    String value = source.getString(name);
+                    contextProperties.setProperty(name,value);
+                }
             }
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org