Author: norman.richards(a)jboss.com Date: 2008-03-26 14:56:38 -0400 (Wed, 26 Mar 2008) New Revision: 7714 Modified: trunk/src/main/org/jboss/seam/framework/EntityQuery.java trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java Log: JBSEAM-2747 Modified: trunk/src/main/org/jboss/seam/framework/EntityQuery.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-26 18:16:22 UTC (rev 7713) +++ trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-26 18:56:38 UTC (rev 7714) @@ -44,8 +44,8 @@ @Transactional public boolean isNextExists() { - return resultList!=null && - resultList.size() > getMaxResults(); + return resultList!=null && getMaxResults()!=null && + resultList.size() > getMaxResults(); } Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-26 18:16:22 UTC (rev 7713) +++ trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-26 18:56:38 UTC (rev 7714) @@ -58,7 +58,7 @@ @Transactional public boolean isNextExists() { - return resultList!=null && + return resultList!=null && getMaxResults()!=null && resultList.size() > getMaxResults(); }