You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ka...@apache.org on 2009/01/24 02:50:33 UTC
svn commit: r737289 - in /ode/branches/APACHE_ODE_1.X:
bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
Author: karthick
Date: Sat Jan 24 01:50:32 2009
New Revision: 737289
URL: http://svn.apache.org/viewvc?rev=737289&view=rev
Log:
ODE-498 Handle variables QNames containing prefixes.
Modified:
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java?rev=737289&r1=737288&r2=737289&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java Sat Jan 24 01:50:32 2009
@@ -219,6 +219,10 @@
} else {
if (variable) {
variableExpr.append(ch);
+ // in the name is qualified, don't check if its a qname when we're at the ":" character
+ if (ch == ':') {
+ continue;
+ }
if (index == xpathStr.length() ||
!nameChecker.isQName(variableExpr.substring(1))) {
variable = false;
Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel?rev=737289&r1=737288&r2=737289&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel Sat Jan 24 01:50:32 2009
@@ -86,6 +86,10 @@
<to variable="intVar"/>
</copy>
<copy>
+ <from><literal>1</literal></from>
+ <to variable="intVar"/>
+ </copy>
+ <copy>
<from>ode:process-property("dd:epr")/addr:EndpointReference/child::node()[position()=$intVar]</from>
<to variable="strVar"/>
</copy>
@@ -97,6 +101,10 @@
<from>$eprVar/child::node()[$intVar]</from>
<to variable="strVar"/>
</copy>
+ <copy>
+ <from>concat($eprVar/text()[1], $ode:pid)</from>
+ <to variable="strVar"/>
+ </copy>
</assign>
<reply name="end" partnerLink="TestAssignPartnerLink" portType="test:TestAssignPortType"