details: https://code.openbravo.com/erp/devel/pi/rev/1828446d8690 changeset: 33824:1828446d8690 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Apr 12 17:04:43 2018 +0200 summary: fixes issue 38357: Unused connection pool created on module installation
diffstat: src/org/openbravo/erpCommon/modules/ImportModule.java | 20 ------------------- 1 files changed, 0 insertions(+), 20 deletions(-) diffs (57 lines): diff -r ad75e9315716 -r 1828446d8690 src/org/openbravo/erpCommon/modules/ImportModule.java --- a/src/org/openbravo/erpCommon/modules/ImportModule.java Thu Apr 12 16:28:17 2018 +0200 +++ b/src/org/openbravo/erpCommon/modules/ImportModule.java Thu Apr 12 17:04:43 2018 +0200 @@ -30,14 +30,12 @@ import java.net.URL; import java.net.URLEncoder; import java.rmi.RemoteException; -import java.sql.Connection; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Properties; import java.util.Vector; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -54,7 +52,6 @@ import org.apache.axis.AxisFault; import org.apache.commons.beanutils.DynaBean; -import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.io.FileUtils; import org.apache.ddlutils.io.DataReader; import org.apache.ddlutils.io.DataToArraySink; @@ -1268,21 +1265,6 @@ private void insertDynaModulesInDB(Vector<DynaBean> dModulesToInstall, Vector<DynaBean> dependencies1, Vector<DynaBean> dbPrefix, boolean newModule) throws Exception { - final Properties obProperties = new Properties(); - obProperties.load(new FileInputStream(obDir + "/config/Openbravo.properties")); - - final String url = obProperties.getProperty("bbdd.url") - + (obProperties.getProperty("bbdd.rdbms").equals("POSTGRE") ? "/" - + obProperties.getProperty("bbdd.sid") : ""); - - final BasicDataSource ds = new BasicDataSource(); - ds.setDriverClassName(obProperties.getProperty("bbdd.driver")); - ds.setUrl(url); - ds.setUsername(obProperties.getProperty("bbdd.user")); - ds.setPassword(obProperties.getProperty("bbdd.password")); - - final Connection conn = ds.getConnection(); - Integer seqNo = Integer.valueOf(ImportModuleData.selectSeqNo(pool)); for (final DynaBean module : dModulesToInstall) { @@ -1346,8 +1328,6 @@ (String) module.get("AD_MODULE_DBPREFIX_ID"), (String) module.get("AD_MODULE_ID"), (String) module.get("NAME")); } - - conn.close(); } /** ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits