git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
index 9816c9473c57d81f0b43789f253a4ff6243c814a..5ee6a7feb63cb629afe95839ae7c65ffbd74f355 100644 (file)
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
@@ -6,7 +6,6 @@ import java.util.List;
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
-import org.zkoss.bind.BindUtils;\r
 import org.zkoss.zk.ui.event.Event;\r
 import org.zkoss.zk.ui.event.EventListener;\r
 import org.zkoss.zk.ui.event.Events;\r
@@ -129,14 +128,16 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
         * indexhez kepest\r
         */\r
        private void loadCache(int forIndex) {\r
-               if (cachedMode) {\r
-                       try {\r
-                               // logger.info("Loading {}", forIndex);\r
-                               logger.info("clearCache()");\r
-                               clearCache();\r
+               try {\r
+                       // logger.info("Loading {}", forIndex);\r
+                       logger.info("clearCache()");\r
+                       clearCache();\r
+                       SearchResult<ArchivedMedia> sr = null;\r
+                       int startPos = 0;\r
+\r
+                       if (cachedMode) {\r
                                int halfSize = this.cacheSize / 2;\r
                                int rowLimit = this.cacheSize; // 200\r
-                               int startPos = 0;\r
                                if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0\r
                                                                                                        // cache=0-200, forIndex=150\r
                                                                                                        // startPos=50 cache=50-250\r
@@ -148,33 +149,33 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
                                endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize;\r
                                logger.info("endPos= {}", endPos);\r
 \r
-                               SearchResult<ArchivedMedia> sr = createSearchResult(startPos, endPos);\r
+                               sr = createSearchResult(startPos, endPos);\r
+                       } else {\r
+                               sr = createSearchResult(startPos, 0);\r
+                       }\r
 \r
-                               if (sr != null) {\r
+                       if (sr != null) {\r
 \r
-                                       if (this.resultSetSize < 0) {\r
-                                               this.resultSetSize = (int) sr.getItemCount();\r
-                                       }\r
-//                                     this.cacheSize = resultSetSize;\r
-//                                     logger.info(cacheSize);\r
-\r
-                                       List<ArchivedMedia> resList = sr.getItems();\r
-                                       if (resList != null) {\r
-                                               for (int c = 0; c < resList.size(); c++) {\r
-                                                       cache.put(startPos + c, resList.get(c));\r
-                                               }\r
-                                       }\r
+                               if (this.resultSetSize < 0) {\r
+                                       this.resultSetSize = (int) sr.getItemCount();\r
+                               }\r
 \r
-                                       cacheStart = startPos + 1;\r
-                                       cacheEnd = cacheStart + (cache.size() == 0 ? 0 : (cache.size() - 1));\r
-                                       BindUtils.postNotifyChange(null, null, this, "*");\r
-                                       fireCacheEvent(new Event(Events.ON_SCROLL));\r
+                               List<ArchivedMedia> resList = sr.getItems();\r
+                               if (resList != null) {\r
+                                       for (int c = 0; c < resList.size(); c++) {\r
+                                               cache.put(startPos + c, resList.get(c));\r
+                                       }\r
                                }\r
-                       } catch (Exception e) {\r
-                               fireCacheEvent(new Event(Events.ON_ERROR, null, e));\r
-                               // ki kell nullazni, egybkent tobbszeros lekerdezes van\r
-                               resultSetSize = 0;\r
+\r
+                               cacheStart = startPos + 1;\r
+                               cacheEnd = cacheStart + (cache.size() == 0 ? 0 : (cache.size() - 1));\r
+//                             BindUtils.postNotifyChange(null, null, this, "*");\r
+//                             fireCacheEvent(new Event(Events.ON_SCROLL));\r
                        }\r
+               } catch (Exception e) {\r
+                       fireCacheEvent(new Event(Events.ON_ERROR, null, e));\r
+                       // ki kell nullazni, egybkent tobbszeros lekerdezes van\r
+                       resultSetSize = 0;\r
                }\r
        }\r
 \r