Author: ningjiang
Date: Tue Mar 5 08:47:47 2013
New Revision: 1452695
URL: http://svn.apache.org/r1452695
Log:
CAMEL-6128 try to use the InputStream if the StaxStreamReader is not working
Merged revisions 1452689 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1452689 | ningjiang | 2013-03-05 16:09:33 +0800 (Tue, 05 Mar 2013) | 1 line
CAMEL-6128 try to use the InputStream if the StaxStreamReader is not working
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
camel/branches/camel-2.10.x/components/camel-jms/ (props changed)
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1452689
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=1452695&r1=1452694&r2=1452695&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
Tue Mar 5 08:47:47 2013
@@ -162,8 +162,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);
Propchange: camel/branches/camel-2.10.x/components/camel-jms/
------------------------------------------------------------------------------
Merged /camel/trunk/components/camel-jms:r1452689
