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

IDEMPIERE-731 Deactivating a node could impact proceeding / IDEMPIERE-1137 NPE in Form "WorkFlow Editor"

This commit is contained in:
Carlos Ruiz 2018-05-29 16:13:30 +02:00
parent 434a0b0780
commit 6b5e6840aa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base/src/org/compiere/wf/MWFNode.java
View File

@ -186,7 +186,8 @@ public class MWFNode extends X_AD_WF_Node
*/
private void loadNext()
{
m_next = new Query(getCtx(), MWFNodeNext.Table_Name, "AD_WF_Node_ID=?", get_TrxName())
m_next = new Query(getCtx(), MWFNodeNext.Table_Name, "AD_WF_NodeNext.AD_WF_Node_ID=?", get_TrxName())
.addJoinClause(" JOIN AD_WF_Node ON (AD_WF_Node.AD_WF_Node_ID=AD_WF_NodeNext.AD_WF_Next_ID AND AD_WF_Node.IsActive='Y')")
.setParameters(new Object[]{get_ID()})
.setOnlyActiveRecords(true)
.setOrderBy(MWFNodeNext.COLUMNNAME_SeqNo)

2
org.adempiere.base/src/org/compiere/wf/MWorkflow.java
View File

@ -435,7 +435,7 @@ public class MWorkflow extends X_AD_Workflow
for (int i = 0; i < nexts.length; i++)
{
MWFNode child = getNode (nexts[i].getAD_WF_Next_ID());
if (!child.isActive())
if (child == null || !child.isActive())
continue;
if (child.getAD_Client_ID() == 0
|| child.getAD_Client_ID() == AD_Client_ID)