Author: rr
Date: Mon Aug 3 21:33:42 2009
New Revision: 800577
URL: http://svn.apache.org/viewvc?rev=800577&view=rev
Log:
ODE-572: LValue evaluation job failed after assign to const expression fix
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java?rev=800577&r1=800576&r2=800577&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
Mon Aug 3 21:33:42 2009
@@ -127,7 +127,13 @@
final BpelRuntimeContext napi = getBpelRuntimeContext();
Node lval = null;
if (!(to instanceof OAssign.PartnerLinkRef)) {
- VariableInstance lvar = _scopeFrame.resolve(to.getVariable());
+ VariableInstance lvar;
+ try {
+ lvar = _scopeFrame.resolve(to.getVariable());
+ } catch (RuntimeException e) {
+ __log.error("iid: " + getBpelRuntimeContext().getPid() + "
error evaluating lvalue");
+ throw new
FaultException(getOAsssign().getOwner().constants.qnSelectionFailure,
e.getMessage());
+ }
if (lvar == null) {
String msg = __msgs.msgEvalException(to.toString(), "Could not
resolve variable in current scope");
if (__log.isDebugEnabled()) __log.debug(to + ": " + msg);
Modified:
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel?rev=800577&r1=800576&r2=800577&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
Mon Aug 3 21:33:42 2009
@@ -107,6 +107,19 @@
<to variable="otherMsgVar" part="TestPart"/>
</copy>
</assign>
+ <scope>
+ <faultHandlers>
+ <catchAll>
+ <empty/>
+ </catchAll>
+ </faultHandlers>
+ <assign>
+ <copy>
+ <from>1</from>
+ <to>1</to>
+ </copy>
+ </assign>
+ </scope>
<reply name="end" partnerLink="TestAssignPartnerLink"
portType="test:TestAssignPortType"
operation="testAssign" variable="otherMsgVar"/>
</sequence>
