Updated Branches: refs/heads/ode-1.3.6.x 8cb723667 -> 3650fcc1b
Backport: MissingIgnoreFromData does not work, and corrupts server (test + fix) git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@966143 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/daad0b66 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/daad0b66 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/daad0b66 Branch: refs/heads/ode-1.3.6.x Commit: daad0b6636180396c34dde471774a83486ff1c5d Parents: 8cb7236 Author: Rafal Konrad Rusin <[email protected]> Authored: Wed Jul 21 08:53:40 2010 +0000 Committer: Tammo van Lessen <[email protected]> Committed: Tue Sep 17 00:15:40 2013 +0200 ---------------------------------------------------------------------- .../xpath20/runtime/XPath20ExpressionModifier.java | 2 ++ .../main/java/org/apache/ode/bpel/runtime/ASSIGN.java | 3 +-- .../TestInsertMissingData/TestInsertMissingData.bpel | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/daad0b66/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java index 95fa559..a4c7358 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionModifier.java @@ -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; http://git-wip-us.apache.org/repos/asf/ode/blob/daad0b66/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java index 378003a..a2f153c 100644 --- a/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java +++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java @@ -715,8 +715,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); } } http://git-wip-us.apache.org/repos/asf/ode/blob/daad0b66/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel ---------------------------------------------------------------------- diff --git a/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel b/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel index 18d0259..29dc509 100644 --- a/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel +++ b/bpel-test/src/test/resources/bpel/2.0/TestInsertMissingData/TestInsertMissingData.bpel @@ -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>
