[riftsaw-commits] riftsaw SVN: r1352 - branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine.
Author: objectiser
Date: 2011-04-13 10:16:34 -0400 (Wed, 13 Apr 2011)
New Revision: 1352
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
Log:
RIFTSAW-372 - make header properties accessible to correlation of messages after the
initial one.
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java 2011-04-11
13:21:03 UTC (rev 1351)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java 2011-04-13
14:16:34 UTC (rev 1352)
@@ -1294,7 +1294,7 @@
}
}
- private Element mergeHeaders(MessageDAO msg) {
+ protected static Element mergeHeaders(MessageDAO msg) {
if(msg==null) return null;
// Merging header data, it's all stored in the same variable
Element data = msg.getData();
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
===================================================================
---
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2011-04-11
13:21:03 UTC (rev 1351)
+++
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2011-04-13
14:16:34 UTC (rev 1352)
@@ -291,7 +291,7 @@
CorrelationKeySet keySet = new CorrelationKeySet();
Operation operation = mex.getOperation();
- Element msg = mex.getRequest().getMessage();
+ Element msg = BpelRuntimeContextImpl.mergeHeaders(mex.getDAO().getRequest());
javax.wsdl.Message msgDescription = operation.getInput().getMessage();
Set<OScope.CorrelationSet> csets =
_plinkDef.getNonInitiatingCorrelationSetsForOperation(operation);