Author: mriou
Date: Fri Oct 20 21:33:10 2006
New Revision: 466332
URL: http://svn.apache.org/viewvc?view=rev&rev=466332
Log:
Endpoints should be set from an incoming callback endpoint when
initializePartnerRole="no" even if it's been set already (by mistake in our
current implementation).
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java?view=diff&rev=466332&r1=466331&r2=466332
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
Fri Oct 20 21:33:10 2006
@@ -251,7 +251,7 @@
if (_oevent.partnerLink.hasPartnerRole()) {
// Trying to initialize partner epr based
on a message-provided epr/session.
if
(!getBpelRuntimeContext().isPartnerRoleEndpointInitialized(ehScopeFrame
- .resolve(_oevent.partnerLink))) {
+ .resolve(_oevent.partnerLink)) ||
!_oevent.partnerLink.initializePartnerRole) {
Node fromEpr =
getBpelRuntimeContext().getSourceEPR(mexId);
if (fromEpr != null) {
getBpelRuntimeContext().writeEndpointReference(
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java?view=diff&rev=466332&r1=466331&r2=466332
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
Fri Oct 20 21:33:10 2006
@@ -122,7 +122,7 @@
if (_oinvoke.partnerLink.hasPartnerRole()) {
// Trying to initialize partner epr based on a
message-provided epr/session.
if
(!getBpelRuntimeContext().isPartnerRoleEndpointInitialized(_scopeFrame
- .resolve(_oinvoke.partnerLink))) {
+ .resolve(_oinvoke.partnerLink)) ||
!_oinvoke.partnerLink.initializePartnerRole) {
Node fromEpr =
getBpelRuntimeContext().getSourceEPR(mexId);
if (fromEpr != null) {
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java?view=diff&rev=466332&r1=466331&r2=466332
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
Fri Oct 20 21:33:10 2006
@@ -184,7 +184,7 @@
// Trying to initialize partner epr based on a
message-provided epr/session.
if
(!getBpelRuntimeContext().isPartnerRoleEndpointInitialized(_scopeFrame
- .resolve(onMessage.partnerLink))) {
+ .resolve(onMessage.partnerLink)) ||
!onMessage.partnerLink.initializePartnerRole) {
Node fromEpr =
getBpelRuntimeContext().getSourceEPR(mexId);
if (fromEpr != null) {
