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

Fix [ 1890616 ] Workflow infinate loop (fix attached) 

Thanks to Kostadin
This commit is contained in:
Carlos Ruiz 2008-08-21 18:05:44 +00:00
parent 84225f6456
commit 4a362a08c6
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
base/src/org/compiere/wf/MWorkflow.java
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution * * Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. * * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
@ -283,6 +283,8 @@ public class MWorkflow extends X_AD_Workflow
for (int i = 0; i < m_nodes.size(); i++) for (int i = 0; i < m_nodes.size(); i++)
{ {
MWFNode node = m_nodes.get(i); MWFNode node = m_nodes.get(i);
if (!node.isActive())
continue;
if (node.getAD_Client_ID() == 0 || node.getAD_Client_ID() == AD_Client_ID) if (node.getAD_Client_ID() == 0 || node.getAD_Client_ID() == AD_Client_ID)
list.add(node); list.add(node);
} }
@ -359,6 +361,8 @@ public class MWorkflow extends X_AD_Workflow
for (int n = 0; n < m_nodes.size(); n++) for (int n = 0; n < m_nodes.size(); n++)
{ {
MWFNode node = (MWFNode)m_nodes.get(n); MWFNode node = (MWFNode)m_nodes.get(n);
if (!node.isActive())
continue;
if (node.getAD_Client_ID() == 0 || node.getAD_Client_ID() == AD_Client_ID) if (node.getAD_Client_ID() == 0 || node.getAD_Client_ID() == AD_Client_ID)
{ {
boolean found = false; boolean found = false;
@ -400,7 +404,10 @@ public class MWorkflow extends X_AD_Workflow
// Get Dependent // Get Dependent
MWFNodeNext[] nexts = node.getTransitions(AD_Client_ID); MWFNodeNext[] nexts = node.getTransitions(AD_Client_ID);
for (int i = 0; i < nexts.length; i++) for (int i = 0; i < nexts.length; i++)
addNodesDF (list, nexts[i].getAD_WF_Next_ID(), AD_Client_ID); {
if (nexts[i].isActive())
addNodesDF (list, nexts[i].getAD_WF_Next_ID(), AD_Client_ID);
}
} }
} // addNodesDF } // addNodesDF
@ -412,6 +419,7 @@ public class MWorkflow extends X_AD_Workflow
*/ */
private void addNodesSF (ArrayList<MWFNode> list, int AD_WF_Node_ID, int AD_Client_ID) private void addNodesSF (ArrayList<MWFNode> list, int AD_WF_Node_ID, int AD_Client_ID)
{ {
ArrayList<MWFNode> tmplist = new ArrayList<MWFNode> ();
MWFNode node = getNode (AD_WF_Node_ID); MWFNode node = getNode (AD_WF_Node_ID);
if (node != null if (node != null
&& (node.getAD_Client_ID() == 0 || node.getAD_Client_ID() == AD_Client_ID)) && (node.getAD_Client_ID() == 0 || node.getAD_Client_ID() == AD_Client_ID))
@ -422,16 +430,20 @@ public class MWorkflow extends X_AD_Workflow
for (int i = 0; i < nexts.length; i++) for (int i = 0; i < nexts.length; i++)
{ {
MWFNode child = getNode (nexts[i].getAD_WF_Next_ID()); MWFNode child = getNode (nexts[i].getAD_WF_Next_ID());
if (!child.isActive())
continue;
if (child.getAD_Client_ID() == 0 if (child.getAD_Client_ID() == 0
|| child.getAD_Client_ID() == AD_Client_ID) || child.getAD_Client_ID() == AD_Client_ID)
{ {
if (!list.contains(child)) if (!list.contains(child)){
list.add(child); list.add(child);
tmplist.add(child);
}
} }
} }
// Remainder Nodes not conncetd // Remainder Nodes not connected
for (int i = 0; i < nexts.length; i++) for (int i = 0; i < tmplist.size(); i++)
addNodesSF (list, nexts[i].getAD_WF_Next_ID(), AD_Client_ID); addNodesSF (list, tmplist.get(i).get_ID(), AD_Client_ID);
} }
} // addNodesSF } // addNodesSF