MGR-128

appNG · Dec 9, 2021 · 8fa87fb · 8fa87fb
1 parent 022ab2f
commit 8fa87fb
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/org/appng/application/manager/business/Cache.java b/src/main/java/org/appng/application/manager/business/Cache.java
@@ -109,21 +109,22 @@ public DataContainer getData(Site site, Application application, Environment env
 				List<CacheEntry> cacheEntries = new ArrayList<>();
 
 				javax.cache.Cache<String, CachedResponse> cache = CacheService.getCache(cacheSite.get());
-				int cacheSize = cache.unwrap(ICache.class).size();
+				@SuppressWarnings("unchecked")
+				ICache<String, CachedResponse> icache = cache.unwrap(ICache.class);
+				int cacheSize = icache.size();
 
 				if (cacheSize > maxCacheEntries) {
-					Iterator<javax.cache.Cache.Entry<String, CachedResponse>> elements = cache.iterator();
 					int idx = 0;
 					int startIdx = pageable.getOffset();
 					int endIdx = pageable.getOffset() + pageable.getPageSize();
+
+					Iterator<javax.cache.Cache.Entry<String, CachedResponse>> elements = icache.iterator(endIdx);
 					while (elements.hasNext()) {
 						javax.cache.Cache.Entry<java.lang.String, CachedResponse> entry = elements.next();
 						if (idx >= startIdx && idx < endIdx) {
 							cacheEntries.add(new CacheEntry(entry.getValue()));
 						}
-						if (idx++ >= endIdx) {
-							break;
-						}
+						idx++;
 					}
 
 					fp.getFields().stream().filter(f -> !"id".equals(f.getBinding())).forEach(f -> f.setSort(null));