svn commit: r708962 - in /ode/branches/APACHE_ODE_1.X: bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java

[karthick]

Author: karthick
Date: Wed Oct 29 10:59:58 2008
New Revision: 708962

URL: http://svn.apache.org/viewvc?rev=708962&view=rev
Log:
Turning StructuredActivities20Test#testFlowActivity1 back on, after having 
fixed a simple-type-related issue in JAXPVariableResolver.

Modified:
    
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
    
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java?rev=708962&r1=708961&r2=708962&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
 Wed Oct 29 10:59:58 2008
@@ -132,6 +132,18 @@
             // Saxon wants its own dateTime type and doesn't like Calendar or 
Date
             if (jobj instanceof Calendar) {
                return new DateTimeValue((Calendar) jobj, true);
+            } else if (jobj instanceof Long) {
+                try {
+                       return Long.valueOf(text);
+               } catch (NumberFormatException e) { }
+               } else if (jobj instanceof Double) {
+               try {
+                       return Double.valueOf(text);
+               } catch (NumberFormatException e) { }
+               } else if (jobj instanceof Integer) {
+               try {
+                       return Integer.valueOf(text);
+               } catch (NumberFormatException e) { }
             } else {
                // return the value wrapped in a text node
                 return doc.createTextNode(jobj.toString());
@@ -139,12 +151,12 @@
         } catch (Exception e) { }
         // Elegant way failed, trying brute force 
         // Actually, we don't want to return simple types, so no more brute 
force
-       // try {
-       //      return Integer.valueOf(text);
-       //} catch (NumberFormatException e) { }
-       //try {
-       //      return Double.valueOf(text);
-       //} catch (NumberFormatException e) { }
+        try {
+               return Integer.valueOf(text);
+       } catch (NumberFormatException e) { }
+       try {
+               return Double.valueOf(text);
+       } catch (NumberFormatException e) { }
         
         // Remember: always a node set
         if (simpleNode.getParentNode() != null)

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java?rev=708962&r1=708961&r2=708962&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/StructuredActivities20Test.java
 Wed Oct 29 10:59:58 2008
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 public class StructuredActivities20Test extends BPELTestAbstract {
-       @Ignore
        @Test public void testFlowActivity1() throws Throwable {
         // Test Flow with XPath20
         go("/bpel/2.0/TestFlowActivity1");