[jboss-cvs] JBossAS SVN: r100345 - projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa.

[jboss-cvs-commits at lists.jboss.org]

Author: lvlcek at redhat.com
Date: 2010-02-03 09:07:56 -0500 (Wed, 03 Feb 2010)
New Revision: 100345

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
Log:
fixing sublists

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java	2010-02-03 14:07:07 UTC (rev 100344)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java	2010-02-03 14:07:56 UTC (rev 100345)
@@ -31,9 +31,13 @@
    public List<Account> findByCriteria(AccountSearchCriteria criteria)
    {
       Query query = getQuery(criteria, null);
-      return (criteria.getRange() != null ?
-            query.getResultList().subList(criteria.getRange().getMinIndex(), criteria.getRange().getMaxIndex()) :
-            query.getResultList());
+      List<Account> list = query.getResultList();
+      if (criteria.getRange() != null)
+      {
+         int max = (criteria.getRange().getMaxIndex() > list.size() ? list.size() : criteria.getRange().getMaxIndex());
+         list = list.subList(criteria.getRange().getMinIndex(), max);
+      }
+      return list;
    }
 
    private Query getQuery(AccountSearchCriteria criteria, String select)

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java	2010-02-03 14:07:07 UTC (rev 100344)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java	2010-02-03 14:07:56 UTC (rev 100345)
@@ -29,9 +29,13 @@
    public List<Reservation> getByCriteria(ReservationSearchCriteria criteria)
    {
       Query query = getQuery(criteria, null);
-      return (criteria.getRange() != null ?
-            query.getResultList().subList(criteria.getRange().getMinIndex(), criteria.getRange().getMaxIndex()) :
-            query.getResultList());
+      List<Reservation> list = query.getResultList();
+      if (criteria.getRange() != null)
+      {
+         int max = (criteria.getRange().getMaxIndex() > list.size() ? list.size() : criteria.getRange().getMaxIndex());
+         list = list.subList(criteria.getRange().getMinIndex(), max);
+      }
+      return list;
    }
 
    private Query getQuery(ReservationSearchCriteria criteria, String select)