This is an automated email from the ASF dual-hosted git repository.

dashorst pushed a commit to branch archive/wicket-1.1.x
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 467d4bcb8e7b199665a576ea1c8a78fb1ba12ea2
Author: Igor Vaynberg <[email protected]>
AuthorDate: Wed Nov 2 00:20:29 2005 +0000

    fix for 1345332 part 2
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/incubator/wicket/branches/WICKET_1_1@457996 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../markup/html/repeater/data/GridView.java        | 30 ++++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git 
a/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/data/GridView.java
 
b/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/data/GridView.java
index 99fa020cde..ac9eb07170 100644
--- 
a/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/data/GridView.java
+++ 
b/wicket-extensions/src/java/wicket/extensions/markup/html/repeater/data/GridView.java
@@ -35,13 +35,13 @@ import wicket.version.undo.Change;
  * Example:
  * 
  * <pre>
- *          
- *          
- *          &lt;tbody&gt; &lt;tr wicket:id=&quot;rows&quot; 
class=&quot;even&quot;&gt;
- *          &lt;td wicket:id=&quot;cols&quot;&gt; &lt;span
- *          wicket:id=&quot;id&quot;&gt;Test ID&lt;/span&gt;&lt;/td&gt; ...
- *          
- *          
+ *              
+ *              
+ *              &lt;tbody&gt; &lt;tr wicket:id=&quot;rows&quot; 
class=&quot;even&quot;&gt;
+ *              &lt;td wicket:id=&quot;cols&quot;&gt; &lt;span
+ *              wicket:id=&quot;id&quot;&gt;Test ID&lt;/span&gt;&lt;/td&gt; ...
+ *              
+ *              
  * </pre>
  * 
  * <p>
@@ -174,7 +174,21 @@ public abstract class GridView extends AbstractDataView
 
        private void updateItemsPerPage()
        {
-               internalSetItemsPerPage(rows * columns);
+               int items = Integer.MAX_VALUE;
+
+               // need to check for overflow
+
+               long result = (long)rows * (long)columns;
+               int desiredHiBits = -((int)(result >>> 31) & 1);
+               int actualHiBits = (int)(result >>> 32);
+
+               if (desiredHiBits == actualHiBits)
+               {
+                       items = (int)result;
+               }
+
+               internalSetItemsPerPage(items);
+
        }
 
        protected void addItems(Iterator items)

Reply via email to