You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/07/21 10:53:41 UTC
svn commit: r966143 - in /ode/trunk:
bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/
bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/
Author: rr
Date: Wed Jul 21 08:53:40 2010
New Revision: 966143
URL: http://svn.apache.org/viewvc?rev=966143&view=rev
Log:
MissingIgnoreFromData does not work, and corrupts server (test + fix)
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java?rev=966143&r1=966142&r2=966143&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java Wed Jul 21 08:53:40 2010
@@ -177,6 +177,8 @@ public class XPath20ExpressionModifier {
} else if (remainingSteps instanceof AxisExpression) {
pathExpr = null;
step = (AxisExpression) remainingSteps;
+ } else {
+ throw new RuntimeException("Not supported step " + remainingSteps + " in expression " + expression);
}
} else {
break;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java?rev=966143&r1=966142&r2=966143&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java Wed Jul 21 08:53:40 2010
@@ -702,8 +702,7 @@ class ASSIGN extends ACTIVITY {
return getBpelRuntimeContext().getExpLangRuntime()
.evaluateNode(expr, this);
} catch (org.apache.ode.bpel.explang.EvaluationException e) {
- throw new InvalidProcessException("Expression Failed: " + expr,
- e);
+ throw new FaultException(expr.getOwner().constants.qnSubLanguageExecutionFault, e);
}
}
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel?rev=966143&r1=966142&r2=966143&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel Wed Jul 21 08:53:40 2010
@@ -100,6 +100,20 @@
</copy>
</assign>
+ <scope>
+ <faultHandlers>
+ <catchAll>
+ <empty/>
+ </catchAll>
+ </faultHandlers>
+ <assign name="assign4">
+ <copy insertMissingToData="yes">
+ <from>$request.requestMessageData/typeIndicators/types:indicatorTwo</from>
+ <to>$testType/child::typeIndicators[15]</to>
+ </copy>
+ </assign>
+ </scope>
+
<reply name="reply" partnerLink="request" portType="wns:TestInsertMissingDataPT" operation="request" variable="reply"/>
</sequence>
</process>