[Openutils-svn] SF.net SVN: openutils:[3669] trunk/openutils-mgnlcriteria/src/main/java/net /sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java

[<car...@us...>]

Revision: 3669
          http://openutils.svn.sourceforge.net/openutils/?rev=3669&view=rev
Author:   carlocolombo
Date:     2011-09-16 16:35:27 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
[CRIT-44]handled only offset set in criteria

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java	2011-09-16 16:34:03 UTC (rev 3668)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java	2011-09-16 16:35:27 UTC (rev 3669)
@@ -211,7 +211,7 @@
             throw jqe;
         }
 
-        if (applyLocalPaging && itemsPerPage > 0)
+        if ((applyLocalPaging && (itemsPerPage > 0 || offset > 0)))
         {
 
             if (offset == 0)
@@ -219,9 +219,6 @@
                 offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * itemsPerPage;
             }
 
-            // rows.getSize() may return -1
-            // if (rows.getSize() >= offset)
-
             // removing preceding records
             rows.skip(offset);
 
@@ -244,7 +241,7 @@
                 @Override
                 public long getSize()
                 {
-                    return Math.min(super.getSize() - offset, itemsPerPage);
+                    return Math.min(super.getSize() - offset, itemsPerPage == 0 ? super.getSize() : itemsPerPage);
                 }
             };
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.