From 5ca5782734b8a80f2f6e653c95bf0c19c082dd21 Mon Sep 17 00:00:00 2001
From: Boris Bendyukov <bbendukow@gmail.com>
Date: Fri, 17 Jan 2014 10:45:15 +0000
Subject: [PATCH] ReceiveUnitImpl.java edited online with Bitbucket

---
 .../bpel/core/bpel/model/runtime/impl/ReceiveUnitImpl.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ReceiveUnitImpl.java b/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ReceiveUnitImpl.java
index 85e1e5ea9..c0bc0a462 100755
--- a/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ReceiveUnitImpl.java
+++ b/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ReceiveUnitImpl.java
@@ -140,7 +140,6 @@ public class ReceiveUnitImpl extends ActivityUnitImpl {
 			Object[] result = procMgr.receiveRequestOrPutInPendingQueue(mWaitingForEvent, frame);
 			MessageContainer request = (MessageContainer) result[0];
 			if(request != null) {
-				receive.setMessageExchange(request.getId());
 				mContext.addRequest(receive, request);
 			}
 			//Post event
@@ -244,7 +243,6 @@ public class ReceiveUnitImpl extends ActivityUnitImpl {
 				return false;
 			}
 		}
-		receive.setMessageExchange(request.getId());
 			mContext.addRequest(receive, request);
 
 		frame.onLineChange(this);
@@ -369,7 +367,7 @@ public class ReceiveUnitImpl extends ActivityUnitImpl {
 			// persist the receive, and then calculate the correlation values.
 			frame.getProcessInstance().getPersistenctMgr().updateState(this, rObjs, 
 					TransactionInfo.getLocalTxInfo(), mContext.getStateContext().getState(),
-					frame.getBranchInvokeCounter());
+					frame.getBranchInvokeCounter(), request.getId());
 
 			// process correlations
 			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
 			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.