Author: mriou
Date: Tue Jun 24 07:41:57 2008
New Revision: 671198
URL: http://svn.apache.org/viewvc?rev=671198&view=rev
Log:
ODE-313 Correlation pattern should not be needed on ONE_WAY operation
invocations
Modified:
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
Modified:
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java?rev=671198&r1=671197&r2=671198&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
Tue Jun 24 07:41:57 2008
@@ -31,6 +31,7 @@
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.MemberOfFunction;
+import javax.wsdl.OperationType;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -48,7 +49,7 @@
public void compile(OActivity output, Activity srcx) {
InvokeActivity src = (InvokeActivity) srcx;
- OInvoke oinvoke = (OInvoke) output;
+ final OInvoke oinvoke = (OInvoke) output;
oinvoke.partnerLink =
_context.resolvePartnerLink(src.getPartnerLink());
oinvoke.operation =
_context.resolvePartnerRoleOperation(oinvoke.partnerLink, src.getOperation());
@@ -89,7 +90,8 @@
new MemberOfFunction<Correlation>() {
@Override
public boolean isMember(Correlation o) {
- return o.getPattern() ==
Correlation.CorrelationPattern.OUT;
+ return (o.getPattern() ==
Correlation.CorrelationPattern.OUT)
+ || (o.getPattern()==
Correlation.CorrelationPattern.UNSET && oinvoke.operation.getStyle()==
OperationType.ONE_WAY );
}
});
@@ -114,13 +116,6 @@
oinvoke.assertCorrelationsOutput,
oinvoke.initCorrelationsOutput);
}
-
-// Partner link could be initialized with magic session in a previous
receive.
-// if
(!oinvoke.getOwner().version.equals(Constants.NS_BPEL4WS_2003_03)) {
-// if (!oinvoke.partnerLink.initializePartnerRole &&
!_context.isPartnerLinkAssigned(oinvoke.partnerLink.getName())) {
-// throw new
CompilationException(__cmsgs.errUninitializedPartnerLinkInInvoke(oinvoke.partnerLink.getName()));
-// }
-// }
}
private void doCorrelations(List<Correlation> correlations,
OScope.Variable var,