svn commit: r941994 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/xml/ components/camel-josql/src/main/java/org/apache/camel/builder/sql/ components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/

[ningjiang]

Author: ningjiang
Date: Fri May  7 03:47:41 2010
New Revision: 941994

URL: http://svn.apache.org/viewvc?rev=941994&view=rev
Log:
Try to fix the test errors which are caused by the change of XPathBuilder

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
    
camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
    
camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=941994&r1=941993&r2=941994&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
 Fri May  7 03:47:41 2010
@@ -712,7 +712,7 @@ public class XPathBuilder implements Exp
 
         // try to type convert to the desired type
         Class type = getDocumentType();
-        if (answer == null && type != null) {
+        if (type != null) {
             answer = in.getBody(type);
         }
         // fallback to get the body as is

Modified: 
camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java?rev=941994&r1=941993&r2=941994&view=diff
==============================================================================
--- 
camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
 (original)
+++ 
camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
 Fri May  7 03:47:41 2010
@@ -101,7 +101,6 @@ public class SqlBuilder implements Expre
 
     // Implementation methods
     // -----------------------------------------------------------------------
-    @SuppressWarnings("unchecked")
     protected boolean matches(Exchange exchange, List list) {
         return ObjectHelper.matches(list);
     }

Modified: 
camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml?rev=941994&r1=941993&r2=941994&view=diff
==============================================================================
--- 
camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml
 (original)
+++ 
camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml
 Fri May  7 03:47:41 2010
@@ -28,7 +28,7 @@
       <from uri="direct:start"/>
       <to 
uri="xslt:org/apache/camel/component/xslt/transform.xsl?transformerFactory=factory"/>
       <multicast>
-        <bean ref="testBean"/>
+        <bean ref="testBean"/>        
         <to uri="mock:result"/>
       </multicast>
     </route>