svn commit: r675001 - /tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java

[hl...@apache.org]

Author: hlship
Date: Tue Jul  8 15:14:27 2008
New Revision: 675001

URL: http://svn.apache.org/viewvc?rev=675001&view=rev
Log:
TAPESTRY-2508: HibernateGridDataSource calls Query.setFetchSize() not Query.setMaxResults()

Modified:
    tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java?rev=675001&r1=675000&r2=675001&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateGridDataSource.java Tue Jul  8 15:14:27 2008
@@ -79,8 +79,9 @@
         // We just assume that the property names in the SortContraint match the Hibernate
         // properties.
 
-        Criteria crit = session.createCriteria(entityType).setFirstResult(startIndex).setFetchSize(
-                endIndex - startIndex + 1);
+        Criteria crit = session.createCriteria(entityType);
+
+        crit.setFirstResult(startIndex).setMaxResults(endIndex - startIndex + 1);
 
         for (SortConstraint constraint : sortConstraints)
         {
@@ -103,6 +104,7 @@
             }
         }
 
+        applyAdditionalConstraints(crit);
 
         this.startIndex = startIndex;
 
@@ -110,6 +112,15 @@
     }
 
     /**
+     * Invoked after the main criteria has been set up (firstResult, maxResults and any sort contraints). This gives
+     * subclasses a chance to apply additional constraints before the list of results is obtained from the criteria.
+     * This implementation does nothing and may be overridden.
+     */
+    protected void applyAdditionalConstraints(Criteria crit)
+    {
+    }
+
+    /**
      * Returns a row value at the given index (which must be within the range defined by the call to {@link
      * #prepare(int, int, java.util.List)} ).
      *