Author: ehillenius
Date: Thu Aug 2 11:00:16 2007
New Revision: 562209
URL: http://svn.apache.org/viewvc?view=rev&rev=562209
Log:
like JBQ pointed out, the error diagnostics were wrong; null objects in
repeater models can typically be used. Simply throw an IllegalStateException
now.
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=562209&r1=562208&r2=562209
==============================================================================
---
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
Thu Aug 2 11:00:16 2007
@@ -85,40 +85,17 @@
Iterator it = renderIterator();
if (it.hasNext())
{
- boolean atLeastOneChildRendered = false;
do
{
Component child = (Component)it.next();
- if (child != null)
+ if (child == null)
{
-
markupStream.setCurrentIndex(markupStart);
- renderChild(child);
- atLeastOneChildRendered = true;
+ throw new IllegalStateException("the
render iterator returned null for a child");
}
+ markupStream.setCurrentIndex(markupStart);
+ renderChild(child);
}
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
{
