From ccd790d0d0ce499093b2cb72daec8851f546274c Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 16 Oct 2019 11:09:23 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31573 --- .../src/user/jobengine/zk/model/CachedListModel.java | 6 +++--- .../src/user/jobengine/zk/model/SearchModel.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java index b72494e4..441ad631 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java @@ -20,8 +20,7 @@ import user.jobengine.db.ItemManager; import user.jobengine.search.SearchResult; /** - * Cachelt modell nagy listakhoz. Cacheli a dokumentumokat a megadott meretben. - * Az utoljara elkert index +- cacheSize/2 + * Cachelt modell nagy listakhoz. Cacheli a dokumentumokat a megadott meretben. Az utoljara elkert index +- cacheSize/2 */ public class CachedListModel extends ListModelList { private static final Logger logger = LogManager.getLogger(); @@ -150,7 +149,7 @@ public class CachedListModel extends ListModelList { int rowLimit = this.cacheSize; // 200 int startPos = 0; if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0 - // cache=0-200, forIndex=150 + // cache=0-200, forIndex=150 // startPos=50 cache=50-250 startPos = (forIndex - halfSize); } @@ -161,6 +160,7 @@ public class CachedListModel extends ListModelList { SearchResult sr = createSearchResult(startPos, endPos); if (sr != null) { + if (this.resultSetSize < 0) { this.resultSetSize = (int) sr.getItemCount(); } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java index 99dbdea9..00a0a0b5 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java @@ -246,7 +246,7 @@ public class SearchModel extends AsyncBaseModel { SessionUtil.putUserSearchFilter(searchFilters); } catch (Exception e) { Messagebox.show(e.getMessage(), "Hiba", Messagebox.OK, Messagebox.ERROR); - logger.catching(e); + logger.error(e); } } -- 2.54.0