Author: ivaynberg
Date: Thu Nov 12 07:12:19 2009
New Revision: 835274
URL: http://svn.apache.org/viewvc?rev=835274&view=rev
Log:
wicket-2568 do not call idataprovider.iterator() if size returned zero
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java?rev=835274&r1=835273&r2=835274&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
Thu Nov 12 07:12:19 2009
@@ -103,9 +103,10 @@
*/
public ModelIterator(IDataProvider<T> dataProvider, int offset,
int count)
{
- items = dataProvider.iterator(offset, count);
this.dataProvider = dataProvider;
max = count;
+
+ items = count > 0 ? dataProvider.iterator(offset,
count) : null;
}
/**
@@ -121,7 +122,7 @@
*/
public boolean hasNext()
{
- return items.hasNext() && (index < max);
+ return items != null && items.hasNext() && (index <
max);
}
/**
