Author: mriou
Date: Thu Mar 6 14:59:59 2008
New Revision: 634442
URL: http://svn.apache.org/viewvc?rev=634442&view=rev
Log:
Fix on durations when assigned around.
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java?rev=634442&r1=634441&r2=634442&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
Thu Mar 6 14:59:59 2008
@@ -19,6 +19,7 @@
package org.apache.ode.bpel.elang.xpath20.runtime;
import net.sf.saxon.trans.DynamicError;
+import net.sf.saxon.value.DurationValue;
import net.sf.saxon.xpath.XPathEvaluator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,11 +35,7 @@
import org.apache.ode.utils.ISO8601DateParser;
import org.apache.ode.utils.xsd.Duration;
import org.apache.ode.utils.xsl.XslTransformHandler;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
+import org.w3c.dom.*;
import javax.xml.namespace.QName;
import javax.xml.transform.TransformerFactory;
@@ -104,6 +101,8 @@
String textVal;
if (simpleType instanceof Date)
textVal = ISO8601DateParser.format((Date) simpleType);
+ else if (simpleType instanceof DurationValue)
+ textVal = ((DurationValue)simpleType).getStringValue();
else
textVal = simpleType.toString();
Modified:
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java?rev=634442&r1=634441&r2=634442&view=diff
==============================================================================
---
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
(original)
+++
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java
Thu Mar 6 14:59:59 2008
@@ -61,5 +61,8 @@
@Test public void testMsgDate() throws Throwable {
go("/bpel/2.0/TestMsgDate");
}
+ @Test public void testDuration() throws Throwable {
+ go("/bpel/2.0/TestDuration");
+ }
}