You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2015/11/28 15:26:01 UTC

wicket git commit: WICKET-6045 viewSize can not be greater than available size, which is 0 for null

Repository: wicket
Updated Branches:
  refs/heads/master a5917fd7d -> d3abc0ec0


WICKET-6045 viewSize can not be greater than available size, which is 0 for null


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d3abc0ec
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d3abc0ec
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d3abc0ec

Branch: refs/heads/master
Commit: d3abc0ec0432afedf11f44015cbb3170b49bab7c
Parents: a5917fd
Author: Sven Meier <sv...@apache.org>
Authored: Sat Nov 28 15:22:40 2015 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Sat Nov 28 15:23:08 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/markup/html/list/ListView.java | 2 +-
 .../test/java/org/apache/wicket/markup/html/list/ListViewTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/d3abc0ec/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
index e179d9e..36c468a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
@@ -218,7 +218,7 @@ public abstract class ListView<T> extends AbstractRepeater
 		final Object modelObject = getDefaultModelObject();
 		if (modelObject == null)
 		{
-			return size == Integer.MAX_VALUE ? 0 : size;
+			return 0;
 		}
 
 		// Adjust view size to model object's list size

http://git-wip-us.apache.org/repos/asf/wicket/blob/d3abc0ec/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
index 6c41d6f..451a5a2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
@@ -159,6 +159,6 @@ public class ListViewTest extends WicketTestCase
 		lv.setStartIndex(5);
 		lv.setViewSize(10);
 		assertEquals(0, lv.getStartIndex());
-		assertEquals(10, lv.getViewSize());
+		assertEquals(0, lv.getViewSize());
 	}
 }