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

IDEMPIERE-5506 Oralce: PaymentFormTest hangs due to DB dead lock (#1595)

This commit is contained in:
hengsin 2022-12-05 22:21:25 +08:00 committed by GitHub
parent 816e57ec5a
commit 8cf16e9fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java
View File

@ -435,7 +435,7 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
*/ */
public boolean processOnline(String CCType, String CCNumber, String CCVV, String CCExp) public boolean processOnline(String CCType, String CCNumber, String CCVV, String CCExp)
{ {
return processOnline(CCType, CCNumber, CCVV, CCExp, 0); return processOnline(CCType, CCNumber, CCVV, CCExp, 0, (String)null);
} }
/** /**
@ -445,9 +445,10 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
* @param CCVV credit card ccv * @param CCVV credit card ccv
* @param CCExp credit card expire date * @param CCExp credit card expire date
* @param C_PaymentProcessor_ID optional payment processor id. use the first configure if this is 0 * @param C_PaymentProcessor_ID optional payment processor id. use the first configure if this is 0
* @param trxName optional trx name
* @return true if process successfully * @return true if process successfully
*/ */
public boolean processOnline(String CCType, String CCNumber, String CCVV, String CCExp, int C_PaymentProcessor_ID) public boolean processOnline(String CCType, String CCNumber, String CCVV, String CCExp, int C_PaymentProcessor_ID, String trxName)
{ {
processMsg = null; processMsg = null;
boolean error = false; boolean error = false;
@ -478,7 +479,7 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
if (isCreditMemo) if (isCreditMemo)
payAmount = m_Amount.negate(); payAmount = m_Amount.negate();
MPaymentTransaction mpt = new MPaymentTransaction(Env.getCtx(), 0, null); MPaymentTransaction mpt = new MPaymentTransaction(Env.getCtx(), 0, trxName);
mpt.setAD_Org_ID(m_AD_Org_ID); mpt.setAD_Org_ID(m_AD_Org_ID);
mpt.setCreditCard(MPayment.TRXTYPE_Sales, CCType, CCNumber, CCVV != null ? CCVV : "", CCExp); mpt.setCreditCard(MPayment.TRXTYPE_Sales, CCType, CCNumber, CCVV != null ? CCVV : "", CCExp);
mpt.setAmount(m_C_Currency_ID, payAmount); mpt.setAmount(m_C_Currency_ID, payAmount);
@ -499,7 +500,7 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
} }
else else
{ {
MPaymentProcessor paymentProcessor = new MPaymentProcessor(mpt.getCtx(), mpt.getC_PaymentProcessor_ID(), null); MPaymentProcessor paymentProcessor = new MPaymentProcessor(mpt.getCtx(), mpt.getC_PaymentProcessor_ID(), trxName);
if (paymentProcessor.getTrxType() != null) if (paymentProcessor.getTrxType() != null)
mpt.setTrxType(paymentProcessor.getTrxType()); mpt.setTrxType(paymentProcessor.getTrxType());
} }
@ -532,7 +533,7 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
m_needSave = true; m_needSave = true;
if (mpt.getC_Payment_ID() > 0) if (mpt.getC_Payment_ID() > 0)
{ {
m_mPayment = new MPayment(mpt.getCtx(), mpt.getC_Payment_ID(), null); m_mPayment = new MPayment(mpt.getCtx(), mpt.getC_Payment_ID(), trxName);
String info = m_mPayment.getR_RespMsg() + " (" + m_mPayment.getR_AuthCode() + ") ID=" + m_mPayment.getR_PnRef(); String info = m_mPayment.getR_RespMsg() + " (" + m_mPayment.getR_AuthCode() + ") ID=" + m_mPayment.getR_PnRef();
processMsg = info + "\n" + m_mPayment.getDocumentNo(); processMsg = info + "\n" + m_mPayment.getDocumentNo();
saveChanges(); saveChanges();

2
org.idempiere.test/src/org/idempiere/test/form/PaymentFormTest.java
View File

@ -517,7 +517,7 @@ public class PaymentFormTest extends AbstractTestCase {
processMsg = msg; processMsg = msg;
return false; return false;
} }
if (!processOnline(m_CCType, CCNumber, CCVV, CCExp)) if (!processOnline(m_CCType, CCNumber, CCVV, CCExp, 0, trxName))
return false; return false;
return save(m_CCType, CCNumber, CCExp, m_Amount, trxName); return save(m_CCType, CCNumber, CCExp, m_Amount, trxName);
} }