midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3058 Make 2Pack transaction safe / fixing a case where the packin fails because of foreign keys but still was wrongly being marked as successful

This commit is contained in:
Carlos Ruiz 2017-06-27 01:37:47 +02:00
parent 153a3ea5e4
commit 20a8d8d6f0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
View File

@ -312,8 +312,8 @@ public class PackInHandler extends DefaultHandler {
} }
packIn.getNotifier().addStatusLine(packageStatus); packIn.getNotifier().addStatusLine(packageStatus);
updPackageImpNoTrx(); updPackageImp(m_ctx.trx.getTrxName()); // do not set success until commit on PackInProcess, still can fail
updPackageImpInstNoTrx(); updPackageImpInst(m_ctx.trx.getTrxName());
//reset //reset
setupHandlers(); setupHandlers();
@ -326,31 +326,31 @@ public class PackInHandler extends DefaultHandler {
} catch (RuntimeException re) { } catch (RuntimeException re) {
packageStatus = "Import Failed"; packageStatus = "Import Failed";
packIn.getNotifier().addStatusLine(packageStatus); packIn.getNotifier().addStatusLine(packageStatus);
updPackageImpNoTrx(); updPackageImp(null);
throw re; throw re;
} catch (SAXException se) { } catch (SAXException se) {
packageStatus = "Import Failed"; packageStatus = "Import Failed";
packIn.getNotifier().addStatusLine(packageStatus); packIn.getNotifier().addStatusLine(packageStatus);
updPackageImpNoTrx(); updPackageImp(null);
throw se; throw se;
} }
} }
} }
} // endElement } // endElement
private void updPackageImpNoTrx() { private void updPackageImp(String trxName) {
// NOTE: Updating out of model to avoid change log insert that can cause locks // NOTE: Updating out of model to avoid change log insert that can cause locks
//Update package history log with package status //Update package history log with package status
DB.executeUpdateEx("UPDATE AD_Package_Imp SET Processed=?, PK_Status=?, UpdatedBy=?, Updated=SYSDATE WHERE AD_Package_Imp_ID=?", DB.executeUpdateEx("UPDATE AD_Package_Imp SET Processed=?, PK_Status=?, UpdatedBy=?, Updated=SYSDATE WHERE AD_Package_Imp_ID=?",
new Object[] {"Y", packageStatus, Env.getAD_User_ID(m_ctx.ctx), AD_Package_Imp_ID}, new Object[] {"Y", packageStatus, Env.getAD_User_ID(m_ctx.ctx), AD_Package_Imp_ID},
null); trxName);
} }
private void updPackageImpInstNoTrx() { private void updPackageImpInst(String trxName) {
// NOTE: Updating out of model to avoid change log insert that can cause locks // NOTE: Updating out of model to avoid change log insert that can cause locks
DB.executeUpdateEx("UPDATE AD_Package_Imp_Inst SET PK_Status=?, UpdatedBy=?, Updated=SYSDATE WHERE AD_Package_Imp_Inst_ID=?", DB.executeUpdateEx("UPDATE AD_Package_Imp_Inst SET PK_Status=?, UpdatedBy=?, Updated=SYSDATE WHERE AD_Package_Imp_Inst_ID=?",
new Object[] {packageStatus, Env.getAD_User_ID(m_ctx.ctx), AD_Package_Imp_Inst_ID}, new Object[] {packageStatus, Env.getAD_User_ID(m_ctx.ctx), AD_Package_Imp_Inst_ID},
null); trxName);
} }
private void processDeferElements() throws SAXException { private void processDeferElements() throws SAXException {