details: https://code.openbravo.com/erp/devel/pi/rev/ed70d2867dd8 changeset: 29886:ed70d2867dd8 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Tue Aug 23 16:42:13 2016 +0200 summary: Fixed 33769. Avoid double query in ModuleManagement window (settings tab)
details: https://code.openbravo.com/erp/devel/pi/rev/b7fdb632c2b6 changeset: 29887:b7fdb632c2b6 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Tue Aug 23 17:20:57 2016 +0200 summary: Fixed 33772. Remove double query by saving .list() result instead of calling .count() and then .list() which does 2 selects for the same. diffstat: modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java | 6 ++++-- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diffs (45 lines): diff -r f05cd00a1367 -r b7fdb632c2b6 modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java --- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java Tue Aug 23 17:13:10 2016 +0000 +++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java Tue Aug 23 17:20:57 2016 +0200 @@ -19,6 +19,7 @@ package org.openbravo.userinterface.selector; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.enterprise.context.ApplicationScoped; @@ -87,7 +88,8 @@ obc.add(Restrictions.eq(SelectorField.PROPERTY_OBUISELSELECTOR, sel)); obc.add(Restrictions.isNotNull(SelectorField.PROPERTY_DEFAULTEXPRESSION)); - if (obc.count() == 0) { + List<SelectorField> selFields = obc.list(); + if (selFields.size() == 0) { return result; } @@ -103,7 +105,7 @@ && "true".equals(params.get(SelectorConstants.DS_REQUEST_IS_FILTER_BY_ID_SUPPORTED)); Object exprResult = null; JSONArray idFilters = new JSONArray(); - for (SelectorField f : obc.list()) { + for (SelectorField f : selFields) { try { exprResult = engine.eval(f.getDefaultExpression()); Object bobId = null; diff -r f05cd00a1367 -r b7fdb632c2b6 src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java --- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Tue Aug 23 17:13:10 2016 +0000 +++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Tue Aug 23 17:20:57 2016 +0200 @@ -2363,8 +2363,9 @@ qList.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE + ".id", "8BA0A3775CE14CE69989B6C09982FB2E")); qList.addOrder(Order.asc(org.openbravo.model.ad.domain.List.PROPERTY_SEQUENCENUMBER)); - SQLReturnObject[] fpEnforcementCombo = new SQLReturnObject[qList.list().size()]; - for (org.openbravo.model.ad.domain.List value : qList.list()) { + List<org.openbravo.model.ad.domain.List> rList = qList.list(); + SQLReturnObject[] fpEnforcementCombo = new SQLReturnObject[rList.size()]; + for (org.openbravo.model.ad.domain.List value : rList) { SQLReturnObject val = new SQLReturnObject(); val.setData("ID", value.getSearchKey()); val.setData( ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
