Author: dolander
Date: Tue Apr 12 11:29:04 2005
New Revision: 161081
URL: http://svn.apache.org/viewcvs?view=rev&rev=161081
Log:
Fixed an NPE in the Select when we couldn't make an iterator
over the optionsDataSource. The result was an Assert at dev time
and an NPE when asserts were off.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?view=diff&r1=161080&r2=161081
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
Tue Apr 12 11:29:04 2005
@@ -969,7 +969,8 @@
{
switch (_repCurStage.getValue()) {
case RepeatingStages.INT_BEFORE:
- moveNext();
+ if (!moveNext())
+ return false;
return doRepeaterAfterBody();
case RepeatingStages.INT_OPTION:
assert (_repeaterIterator instanceof Iterator);