cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r568842 - /cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java
Date Thu, 23 Aug 2007 06:40:27 GMT
Author: cziegeler
Date: Wed Aug 22 23:40:27 2007
New Revision: 568842

URL: http://svn.apache.org/viewvc?rev=568842&view=rev
Log:
Fix NPE

Modified:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java?rev=568842&r1=568841&r2=568842&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/instruction/ForEach.java
Wed Aug 22 23:40:27 2007
@@ -132,7 +132,7 @@
             objectModel.put(varStatus, status);
         }
         int skipCounter, count = 1;
-        while (i <= end && iter.hasNext()) {
+        while (i <= end && iter != null && iter.hasNext()) {
             objectModel.markLocalContext();
             Object value = iter.next();
             objectModel.put(ObjectModel.CONTEXTBEAN, value);



Mime
View raw message