svn commit: r698870 - in /activemq/camel/trunk/components: camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ camel-mina/src/main/java/org/apache/camel/component/mina/ camel-saxon/src/main/java/org/apache/camel/component/xquery/

[hadrian]

Author: hadrian
Date: Thu Sep 25 01:45:23 2008
New Revision: 698870

URL: http://svn.apache.org/viewvc?rev=698870&view=rev
Log:
CAMEL-84.  Fixed broken components.

Modified:
    
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
    
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
    
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java

Modified: 
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=698870&r1=698869&r2=698870&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 (original)
+++ 
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 Thu Sep 25 01:45:23 2008
@@ -30,6 +30,7 @@
 import javax.xml.transform.Source;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.spi.TypeConverterAware;
@@ -126,8 +127,9 @@
             // the required source
             JAXBContext context = createContext(value.getClass());
             JAXBSource source = new JAXBSource(context, value);
-            T answer = parentTypeConverter.convertTo(type, source);
-            if (answer == null) {
+            try {
+                return parentTypeConverter.convertTo(type, source);
+            } catch (NoTypeConversionAvailableException e) {
                 // lets try a stream
                 StringWriter buffer = new StringWriter();
                 Marshaller marshaller = context.createMarshaller();
@@ -135,7 +137,6 @@
                 marshaller.marshal(value, buffer);
                 return parentTypeConverter.convertTo(type, buffer.toString());
             }
-            return answer;
         }
 
         // lets try convert to the type from JAXB

Modified: 
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=698870&r1=698869&r2=698870&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
 (original)
+++ 
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
 Thu Sep 25 01:45:23 2008
@@ -27,6 +27,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ExchangePattern;
+import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.impl.DefaultComponent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -288,8 +289,10 @@
     }
 
     protected ByteBuffer toByteBuffer(Object message) throws 
CharacterCodingException {
-        ByteBuffer answer = convertTo(ByteBuffer.class, message);
-        if (answer == null) {
+        ByteBuffer answer = null;
+        try {
+            answer = convertTo(ByteBuffer.class, message);
+        } catch (NoTypeConversionAvailableException e) {
             String value = convertTo(String.class, message);
             answer = ByteBuffer.allocate(value.length()).setAutoExpand(true);
             answer.putString(value, encoder);

Modified: 
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=698870&r1=698869&r2=698870&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
 (original)
+++ 
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
 Thu Sep 25 01:45:23 2008
@@ -51,6 +51,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Message;
+import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeExpressionException;
@@ -391,13 +392,14 @@
         DynamicQueryContext dynamicQueryContext = new 
DynamicQueryContext(config);
 
         Message in = exchange.getIn();
-        Item item = in.getBody(Item.class);
         Source source = null;
-        if (item != null) {
+        try {
+            Item item = in.getBody(Item.class);
             dynamicQueryContext.setContextItem(item);
-        } else {
-            source = in.getBody(Source.class);
-            if (source == null) {
+        } catch (NoTypeConversionAvailableException e) {
+            try {
+                source = in.getBody(Source.class);
+            } catch (NoTypeConversionAvailableException e2) {
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("No body available on exchange so using an empty 
document: " + exchange);
                 }