Author: mriou
Date: Wed Oct 24 15:42:08 2007
New Revision: 588063
URL: http://svn.apache.org/viewvc?rev=588063&view=rev
Log:
ODE-203 Shouldn't complain when a initializePartnerLink=false isn't declared in
deploy.xml.
Modified:
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
Modified:
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=588063&r1=588062&r2=588063&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
Wed Oct 24 15:42:08 2007
@@ -419,8 +419,8 @@
if (pl.hasPartnerRole()) {
Endpoint endpoint =
_pconf.getInvokeEndpoints().get(pl.getName());
- if (endpoint == null)
- throw new IllegalArgumentException(pl.getName() + " must
be bound to an endpoint in deloy.xml");
+ if (endpoint == null && pl.initializePartnerRole)
+ throw new IllegalArgumentException(pl.getName() + " must
be bound to an endpoint in deploy.xml");
PartnerLinkPartnerRoleImpl partnerRole = new
PartnerLinkPartnerRoleImpl(this, pl, endpoint);
_partnerRoles.put(pl, partnerRole);
}
@@ -731,17 +731,20 @@
if (!_hydratedOnce) {
for (PartnerLinkPartnerRoleImpl prole :
_partnerRoles.values()) {
- PartnerRoleChannel channel =
_engine._contexts.bindingContext.createPartnerRoleChannel(_pid,
- prole._plinkDef.partnerRolePortType,
prole._initialPartner);
- prole._channel = channel;
- _partnerChannels.put(prole._initialPartner,
prole._channel);
- EndpointReference epr =
channel.getInitialEndpointReference();
- if (epr != null) {
- prole._initialEPR = epr;
- _partnerEprs.put(prole._initialPartner, epr);
+ // Null for initializePartnerRole = false
+ if (prole._initialPartner != null) {
+ PartnerRoleChannel channel =
_engine._contexts.bindingContext.createPartnerRoleChannel(_pid,
+ prole._plinkDef.partnerRolePortType,
prole._initialPartner);
+ prole._channel = channel;
+ _partnerChannels.put(prole._initialPartner,
prole._channel);
+ EndpointReference epr =
channel.getInitialEndpointReference();
+ if (epr != null) {
+ prole._initialEPR = epr;
+ _partnerEprs.put(prole._initialPartner, epr);
+ }
+ __log.debug("Activated " + _pid + " partnerrole " +
prole.getPartnerLinkName() + ": EPR is "
+ + prole._initialEPR);
}
- __log.debug("Activated " + _pid + " partnerrole " +
prole.getPartnerLinkName() + ": EPR is "
- + prole._initialEPR);
}
_hydratedOnce = true;
}