You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/11/12 08:13:11 UTC
svn commit: r835275 -
/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
Author: ivaynberg
Date: Thu Nov 12 07:13:11 2009
New Revision: 835275
URL: http://svn.apache.org/viewvc?rev=835275&view=rev
Log:
WICKET-2568 do not call idataprovider.iterator() if size returned zero
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java?rev=835275&r1=835274&r2=835275&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java Thu Nov 12 07:13:11 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);
}
/**