ReceiveUnitImpl.java edited online with Bitbucket

master
Boris Bendyukov 2014-01-17 10:45:15 +00:00
parent 63f2053579
commit 5ca5782734
1 changed files with 2 additions and 4 deletions

View File

@ -140,7 +140,6 @@ public class ReceiveUnitImpl extends ActivityUnitImpl {
Object[] result = procMgr.receiveRequestOrPutInPendingQueue(mWaitingForEvent, frame); Object[] result = procMgr.receiveRequestOrPutInPendingQueue(mWaitingForEvent, frame);
MessageContainer request = (MessageContainer) result[0]; MessageContainer request = (MessageContainer) result[0];
if(request != null) { if(request != null) {
receive.setMessageExchange(request.getId());
mContext.addRequest(receive, request); mContext.addRequest(receive, request);
} }
//Post event //Post event
@ -244,7 +243,6 @@ public class ReceiveUnitImpl extends ActivityUnitImpl {
return false; return false;
} }
} }
receive.setMessageExchange(request.getId());
mContext.addRequest(receive, request); mContext.addRequest(receive, request);
frame.onLineChange(this); frame.onLineChange(this);
@ -369,7 +367,7 @@ public class ReceiveUnitImpl extends ActivityUnitImpl {
// persist the receive, and then calculate the correlation values. // persist the receive, and then calculate the correlation values.
frame.getProcessInstance().getPersistenctMgr().updateState(this, rObjs, frame.getProcessInstance().getPersistenctMgr().updateState(this, rObjs,
TransactionInfo.getLocalTxInfo(), mContext.getStateContext().getState(), TransactionInfo.getLocalTxInfo(), mContext.getStateContext().getState(),
frame.getBranchInvokeCounter()); frame.getBranchInvokeCounter(), request.getId());
// process correlations // process correlations
if (receive.getStartType() != Engine.RECEIVE_TYPE_NO_COR_JOIN_ONLY) { if (receive.getStartType() != Engine.RECEIVE_TYPE_NO_COR_JOIN_ONLY) {
@ -444,7 +442,7 @@ public class ReceiveUnitImpl extends ActivityUnitImpl {
// persist the receive activity (PC) as part of the TX // persist the receive activity (PC) as part of the TX
frame.getProcessInstance().getPersistenctMgr().updateState(this, rObjs, txInfo, frame.getProcessInstance().getPersistenctMgr().updateState(this, rObjs, txInfo,
mContext.getStateContext().getState(), frame.getBranchInvokeCounter()); mContext.getStateContext().getState(), frame.getBranchInvokeCounter(), request.getId());
/* /*
* need to set the activity to ExecutionState.WaitingForTxComplete. * need to set the activity to ExecutionState.WaitingForTxComplete.