details: https://code.openbravo.com/erp/devel/pi/rev/e508c5662e33 changeset: 29893:e508c5662e33 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Tue Aug 23 17:34:51 2016 +0200 summary: Fixed 33773. Avoid double query by not calling .list() twice
First case reading from ad_language can be simplified to single .uniqueResult call as filters are unique. 2nd case just saves list() result to avoid 2nd call easily. details: https://code.openbravo.com/erp/devel/pi/rev/af6e72d059cd changeset: 29894:af6e72d059cd user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Tue Aug 23 17:58:45 2016 +0200 summary: Fixed 33774. Fixed accidental double query by not calling .list() twice details: https://code.openbravo.com/erp/devel/pi/rev/197fb66d7cea changeset: 29895:197fb66d7cea user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Wed Aug 24 13:51:59 2016 +0200 summary: Issue 33773. Apply review feedback replace .size() >0 with !isEmpty() details: https://code.openbravo.com/erp/devel/pi/rev/a8163cc557bb changeset: 29896:a8163cc557bb user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Wed Aug 24 13:54:17 2016 +0200 summary: Issue 33774. Apply review feedback, change .size() > 0 to !isEmpty() diffstat: src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 16 +++++----- 1 files changed, 8 insertions(+), 8 deletions(-) diffs (40 lines): diff -r c35e5b050f0b -r a8163cc557bb src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java --- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java Wed Aug 24 11:54:52 2016 +0200 +++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java Wed Aug 24 13:54:17 2016 +0200 @@ -284,10 +284,8 @@ public static Language getLanguage(String strLanguage) throws Exception { final OBCriteria<Language> obcLanguage = OBDal.getInstance().createCriteria(Language.class); obcLanguage.add(Restrictions.eq(Language.PROPERTY_LANGUAGE, strLanguage)); - if (obcLanguage.list().size() > 0) - return obcLanguage.list().get(0); - else - return null; + // ad_language.ad_language is unique + return (Language) obcLanguage.uniqueResult(); } /** @@ -1863,8 +1861,9 @@ obcDataSets.add(Restrictions.eq(DataSet.PROPERTY_MODULE, module)); obcDataSets.add(Restrictions.in(DataSet.PROPERTY_DATAACCESSLEVEL, accessLevel)); obcDataSets.addOrder(Order.asc(DataSet.PROPERTY_NAME)); - if (obcDataSets.list().size() > 0) { - return obcDataSets.list(); + List<DataSet> listDataSets = obcDataSets.list(); + if (!listDataSets.isEmpty()) { + return listDataSets; } else { return null; } @@ -1887,8 +1886,9 @@ .createCriteria(org.openbravo.model.ad.domain.List.class); obcRefList.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE, OBDal .getInstance().get(Reference.class, "181"))); - if (obcRefList.list().size() > 0) { - return obcRefList.list(); + List<org.openbravo.model.ad.domain.List> listRefList = obcRefList.list(); + if (!listRefList.isEmpty()) { + return listRefList; } else { return null; } ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
