[infinispan-commits] Infinispan SVN: r1440 - trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-02-02 10:18:34 -0500 (Tue, 02 Feb 2010)
New Revision: 1440

Modified:
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
Log:
Exclude expired items when loading all.

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java	2010-02-02 15:11:21 UTC (rev 1439)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java	2010-02-02 15:18:34 UTC (rev 1440)
@@ -100,7 +100,9 @@
          public void loadAllProcess(ResultSet rs, Set<InternalCacheEntry> result) throws SQLException, CacheLoaderException {
             InputStream binaryStream = rs.getBinaryStream(1);
             Bucket bucket = (Bucket) JdbcUtil.unmarshall(getMarshaller(), binaryStream);
-            result.addAll(bucket.getStoredEntries());
+            for (InternalCacheEntry ice: bucket.getStoredEntries()) {
+               if (!ice.isExpired()) result.add(ice);
+            }
          }
 
          @Override