svn commit: r1452689 - /camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java

[ningjiang]

Author: ningjiang
Date: Tue Mar  5 08:09:33 2013
New Revision: 1452689

URL: http://svn.apache.org/r1452689
Log:
CAMEL-6128 try to use the InputStream if the StaxStreamReader is not working

Modified:
    
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java

Modified: 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=1452689&r1=1452688&r2=1452689&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 (original)
+++ 
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
 Tue Mar  5 08:09:33 2013
@@ -163,8 +163,13 @@ public class FallbackTypeConverter exten
                 // we cannot filter the XMLStreamReader if necessary
                 XMLStreamReader xmlReader = 
parentTypeConverter.convertTo(XMLStreamReader.class, exchange, value);
                 if (xmlReader != null) {
-                    Object unmarshalled = unmarshal(unmarshaller, exchange, 
xmlReader);
-                    return type.cast(unmarshalled);
+                    try {
+                        Object unmarshalled = unmarshal(unmarshaller, 
exchange, xmlReader);
+                        return type.cast(unmarshalled);
+                    } catch (Exception ex) {
+                        // There is some issue on the StaxStreamReader to 
CXFPayload message body with different namespaces
+                        LOG.info("Cannot use StaxStreamReader to unmarshal the 
message, due to {}", ex);
+                    }
                 }
             }
             InputStream inputStream = 
parentTypeConverter.convertTo(InputStream.class, exchange, value);