svn commit: r718763 - in /ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep: v1/xpath10/JaxenContexts.java v2/xpath10/JaxenContexts.java

[mriou]

Author: mriou
Date: Tue Nov 18 15:21:27 2008
New Revision: 718763

URL: http://svn.apache.org/viewvc?rev=718763&view=rev
Log:
ODE-426 No need to try casting, the XPath engine is supposed to do it where 
required.

Modified:
    
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath10/JaxenContexts.java
    
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java

Modified: 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath10/JaxenContexts.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath10/JaxenContexts.java?rev=718763&r1=718762&r2=718763&view=diff
==============================================================================
--- 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath10/JaxenContexts.java
 (original)
+++ 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/xpath10/JaxenContexts.java
 Tue Nov 18 15:21:27 2008
@@ -174,19 +174,7 @@
                 }
 
                 if (_xpathEvalCtx.narrowTypes() && type instanceof 
OXsdTypeVarType && ((OXsdTypeVarType)type).simple) {
-                    String text = variableNode.getTextContent();
-                    try {
-                        return 
XSTypes.toJavaObject(((OXsdTypeVarType)variable.type).xsdType,
-                                text);
-                    } catch (Exception e) { }
-                    // Elegant way failed, trying brute force
-                    try {
-                        return Integer.valueOf(text);
-                    } catch (NumberFormatException e) { }
-                    try {
-                        return Double.valueOf(text);
-                    } catch (NumberFormatException e) { }
-                    return text;
+                    return variableNode.getTextContent();
                 } else {
                     return variableNode;
                 }

Modified: 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java?rev=718763&r1=718762&r2=718763&view=diff
==============================================================================
--- 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java
 (original)
+++ 
ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java
 Tue Nov 18 15:21:27 2008
@@ -172,19 +172,7 @@
                 }
 
                 if (_xpathEvalCtx.narrowTypes() && type instanceof 
OXsdTypeVarType && ((OXsdTypeVarType)type).simple) {
-                    String text = variableNode.getTextContent();
-                    try {
-                        return 
XSTypes.toJavaObject(((OXsdTypeVarType)variable.type).xsdType,
-                                text);
-                    } catch (Exception e) { }
-                    // Elegant way failed, trying brute force
-                    try {
-                        return Integer.valueOf(text);
-                    } catch (NumberFormatException e) { }
-                    try {
-                        return Double.valueOf(text);
-                    } catch (NumberFormatException e) { }
-                    return text;
+                    return variableNode.getTextContent();
                 } else {
                     return variableNode;
                 }