[ 1854603 ] Prepare method is being called twice

- trx management fix.

base/src/org/compiere/wf/MWFActivity.java

@@ -278,8 +278,8 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 			//	Inform Process
 			if (m_process == null)
 				m_process = new MWFProcess (getCtx(), getAD_WF_Process_ID(), 
-					m_trx == null ? null : m_trx.getTrxName());
+					this.get_TrxName());
-			m_process.checkActivities(m_trx == null ? null : m_trx.getTrxName(), m_po);
+			m_process.checkActivities(this.get_TrxName(), m_po);
 		}
 		else
 		{
@@ -735,6 +735,12 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 	{
 		log.info ("Node=" + getNode());
 		m_newValue = null;
+		
+		String trxName = Trx.createTrxName("WF");
+		m_trx = Trx.get(trxName, true);
+		//
+		try
+		{
 			if (!m_state.isValidAction(StateEngine.ACTION_Start))
 			{
 				setTextMsg("State=" + getWFState() + " - cannot start");
@@ -743,10 +749,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 			}
 			//
 			setWFState(StateEngine.STATE_Running);
-		m_trx = Trx.get(Trx.createTrxName("WF"), true);
+			
-		//
-		try
-		{
 			if (getNode().get_ID() == 0)
 			{
 				setTextMsg("Node not found - AD_WF_Node_ID=" + getAD_WF_Node_ID());
@@ -767,8 +770,6 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 			// Reason: if the commit fails the document should be put in Invalid state
 			try {
 				m_trx.commit(true);					
-				m_trx.close();
-				m_trx = null;
 			} catch (Exception e) {
 				// If we have a DocStatus, change it to Invalid, and throw the exception to the next level
 				if (m_docStatus != null)
@@ -787,8 +788,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 			log.log(Level.WARNING, "" + getNode(), e);
 			/****	Trx Rollback	****/
 			m_trx.rollback();
-			m_trx.close();
+						
-			m_trx = null;
 			//
 			if (e.getCause() != null)
 				log.log(Level.WARNING, "Cause", e.getCause());
@@ -807,7 +807,14 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 				m_po.save();
 			}
 		}
+		finally
+		{
+			if (m_trx != null)
+			{
+				m_trx.close();
+			}
 			m_trx = null;
+		}
 	}	//	run
 	
 	

base/src/org/compiere/wf/MWFProcess.java

@@ -133,6 +133,17 @@ public class MWFProcess extends X_AD_WF_Process
 	 *	@return array of activities
 	 */
 	public MWFActivity[] getActivities (boolean requery, boolean onlyActive)
+	{
+		return getActivities(requery, onlyActive, get_TrxName());
+	}
+	
+	/**
+	 * 	Get active Activities of Process
+	 *	@param requery if true requery
+	 *	@param onlyActive only active activities
+	 *	@return array of activities
+	 */
+	public MWFActivity[] getActivities (boolean requery, boolean onlyActive, String trxName)
 	{
 		if (!requery && m_activities != null)
 			return m_activities;
@@ -145,11 +156,11 @@ public class MWFProcess extends X_AD_WF_Process
 			sql += " AND Processed='N'";
 		try
 		{
-			pstmt = DB.prepareStatement (sql, get_TrxName());
+			pstmt = DB.prepareStatement (sql, trxName);
 			pstmt.setInt (1, getAD_WF_Process_ID());
 			rs = pstmt.executeQuery ();
 			while (rs.next ())
-				list.add (new MWFActivity(getCtx(), rs, get_TrxName()));
+				list.add (new MWFActivity(getCtx(), rs, trxName));
 	 	}
 		catch (Exception e)
 		{
@@ -241,7 +252,7 @@ public class MWFProcess extends X_AD_WF_Process
 		if (m_state.isClosed())
 			return;
 		//
-		MWFActivity[] activities = getActivities (true, true);	//	requery active
+		MWFActivity[] activities = getActivities (true, true, trxName);	//	requery active
 		String closedState = null;
 		boolean suspended = false;
 		boolean running = false;
@@ -253,7 +264,7 @@ public class MWFProcess extends X_AD_WF_Process
 			//	Completed - Start Next
 			if (activityState.isCompleted())
 			{
-				if (startNext (activity, activities, lastPO))
+				if (startNext (activity, activities, lastPO, trxName))
 					continue;		
 			}
 			//
@@ -310,7 +321,7 @@ public class MWFProcess extends X_AD_WF_Process
 	 *	@param activities all activities
 	 *	@return true if there is a next activity
 	 */
-	private boolean startNext (MWFActivity last, MWFActivity[] activities, PO lastPO)
+	private boolean startNext (MWFActivity last, MWFActivity[] activities, PO lastPO, String trxName)
 	{
 		log.fine("Last=" + last);
 		//	transitions from the last processed node
@@ -340,6 +351,7 @@ public class MWFProcess extends X_AD_WF_Process
 			
 			//	Start new Activity...
 			MWFActivity activity = new MWFActivity (this, transitions[i].getAD_WF_Next_ID(), lastPO);
+			activity.set_TrxName(trxName);
 			activity.run();
 			
 			//	only the first valid if XOR