details: https://code.openbravo.com/erp/devel/pi/rev/6792989a9124
changeset: 20504:6792989a9124
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Fri May 31 12:25:02 2013 +0200
summary: Fixes issue 23385: Organization is generated even
if the Initial Org Setup ends with errors
diffstat:
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java | 5 +++++
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diffs (48 lines):
diff -r ada107be4fd6 -r 6792989a9124
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java
--- a/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java Fri May 31
12:13:27 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java Fri May 31
12:25:02 2013 +0200
@@ -30,6 +30,7 @@
import org.openbravo.base.secureApp.OrgTree;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
import org.openbravo.erpCommon.businessUtility.WindowTabs;
import org.openbravo.erpCommon.modules.ModuleReferenceDataOrgTree;
import org.openbravo.erpCommon.utility.LeftTabsBar;
@@ -41,6 +42,7 @@
public class InitialOrgSetup extends HttpSecureAppServlet {
private static final long serialVersionUID = 1L;
+ private static final String OKTYPE = "Success";
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
@@ -72,6 +74,9 @@
strParentOrg, strcLocationId, strPassword, strModules,
isTrue(strCreateAccounting),
fileCoAFilePath, strCurrency, bBPartner, bProduct, bProject,
bCampaign, bSalesRegion,
vars.getSessionValue("#SOURCEPATH"));
+ if (!obeResult.getType().equals(OKTYPE)) {
+ OBDal.getInstance().rollbackAndClose();
+ }
vars.setSessionValue("#USER_ORG", vars.getSessionValue("#USER_ORG") + ",
'" + ios.getOrgId()
+ "'");
vars.setSessionValue("#ORG_CLIENT",
diff -r ada107be4fd6 -r 6792989a9124
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java Fri May
31 12:13:27 2013 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java Fri May
31 12:25:02 2013 +0200
@@ -160,7 +160,6 @@
OBContext.getOBContext().getWritableOrganizations();
try {
OBDal.getInstance().flush();
- OBDal.getInstance().commitAndClose();
org = OBDal.getInstance().get(Organization.class, strOrgId);
client = org.getClient();
if (strcLocationId != null && !strcLocationId.equals(""))
@@ -249,6 +248,7 @@
obResult.setType(OKTYPE);
obResult.setMessage("@" + OKTYPE + "@");
+ OBDal.getInstance().commitAndClose();
return obResult;
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
