Author: ehillenius
Date: Wed Aug 1 14:41:02 2007
New Revision: 561965
URL: http://svn.apache.org/viewvc?view=rev&rev=561965
Log:
WICKET-808 (moved warning outside iterator)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java?view=diff&rev=561965&r1=561964&r2=561965
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
Wed Aug 1 14:41:02 2007
@@ -95,31 +95,29 @@
renderChild(child);
atLeastOneChildRendered = true;
}
- else
- {
- if (log.isWarnEnabled())
- {
- StringBuffer b = new
StringBuffer(
- "Encountered a
null element in the repeater model. Model: [");
- for (Iterator i =
renderIterator(); i.hasNext();)
- {
- Object o = i.next();
- b.append(o != null ? o
: "<NULL>");
- if (i.hasNext())
- {
- b.append(", ");
- }
- }
- b.append("]. Please make sure
you don't provide NULL elements");
- log.warn(b.toString());
- }
- }
}
while (it.hasNext());
if (!atLeastOneChildRendered)
{
markupStream.skipComponent();
+
+ if (log.isWarnEnabled())
+ {
+ StringBuffer b = new StringBuffer(
+ "Encountered a null
element in the repeater model. Model: [");
+ for (Iterator i = renderIterator();
i.hasNext();)
+ {
+ Object o = i.next();
+ b.append(o != null ? o :
"<NULL>");
+ if (i.hasNext())
+ {
+ b.append(", ");
+ }
+ }
+ b.append("]. Please make sure you don't
provide NULL elements");
+ log.warn(b.toString());
+ }
}
}
else
