From a39d4cfed53eb36b931fe8d0336e72479784fea6 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Fri, 26 Apr 2013 18:30:35 +0800 Subject: [PATCH 1/2] IDEMPIERE-862 Create lines from MPS Lines function is not working - fix deadlock problem --- .../src/org/compiere/model/MPackage.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MPackage.java b/org.adempiere.base/src/org/compiere/model/MPackage.java index fb50e5a669..18076db9f7 100644 --- a/org.adempiere.base/src/org/compiere/model/MPackage.java +++ b/org.adempiere.base/src/org/compiere/model/MPackage.java @@ -319,7 +319,7 @@ public class MPackage extends X_M_Package if (line.getM_PackageMPS_ID() == 0) continue; - MPackageMPS packageMPS = new MPackageMPS(getCtx(), line.getM_PackageMPS_ID(), get_TrxName()); + MPackageMPS packageMPS = new MPackageMPS(getCtx(), line.getM_PackageMPS_ID(), null); packageMPS.setMasterTrackingNo(line.getMasterTrackingNo()); packageMPS.setTrackingNo(line.getTrackingNo()); packageMPS.setPrice(line.getPrice()); @@ -369,11 +369,13 @@ public class MPackage extends X_M_Package log.log(Level.SEVERE, "processOnline", e); setErrorMessage(Msg.getMsg(Env.getCtx(), "ShippingNotProcessed") + ": " + e.getMessage()); } - - if (trx != null) - { - trx.commit(); - trx.close(); + finally + { + if (trx != null) + { + trx.commit(); + trx.close(); + } } return ok; From 8c47a32a69a3ea197e9dacf95c7272d6be820b17 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Fri, 26 Apr 2013 18:34:33 +0800 Subject: [PATCH 2/2] The error message of RunProcessResponse for Java process is not set when the process ended with error --- .../WEB-INF/src/org/idempiere/adinterface/Process.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java index edb8d133e5..e90ff8659d 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java @@ -342,6 +342,7 @@ public class Process { if (!processOK || pi.isError()) { r.setSummary(pi.getSummary()); + r.setError(pi.getSummary()); r.setLogInfo(pi.getLogInfo(true)); r.setIsError( true ); processOK = false; @@ -349,6 +350,7 @@ public class Process { else { r.setSummary(pi.getSummary()); + r.setError(pi.getSummary()); r.setLogInfo(pi.getLogInfo(true)); r.setIsError( false ); }