Author: ningjiang
Date: Sat Aug 11 15:47:36 2012
New Revision: 1371967
URL: http://svn.apache.org/viewvc?rev=1371967&view=rev
Log:
CAMEL-5403 Fixed the camel-cxf unit test failures
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1371967&r1=1371966&r2=1371967&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
Sat Aug 11 15:47:36 2012
@@ -169,8 +169,15 @@ public final class CxfPayloadConverter {
}
}
TypeConverter tc = registry.lookup(type, NodeList.class);
- if (tc != null) {
- return tc.convertTo(type, cxfPayloadToNodeList((CxfPayload<?>)
value, exchange));
+ if (tc != null) {
+ Object result = tc.convertTo(type,
cxfPayloadToNodeList((CxfPayload<?>) value, exchange));
+ if (result == null) {
+ // no we could not do it currently, and we just abort the
convert here
+ return (T) Void.TYPE;
+ } else {
+ return (T) result;
+ }
+
}
// we cannot convert a node list, so we try the first item from the
// node list
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java?rev=1371967&r1=1371966&r2=1371967&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
Sat Aug 11 15:47:36 2012
@@ -59,8 +59,10 @@ public class CxfConsumerProviderTest ext
from(getFromEndpointUri()).process(new Processor() {
public void process(final Exchange exchange) {
Message in = exchange.getIn();
+ System.out.println(in.getBody().getClass());
// Get the parameter list
Node node = in.getBody(Node.class);
+ System.out.println("node is " + node);
assertNotNull(node);
XmlConverter xmlConverter = new XmlConverter();
// Put the result back
@@ -80,7 +82,7 @@ public class CxfConsumerProviderTest ext
assertTrue("Get a wrong response ",
response.startsWith(RESPONSE_MESSAGE_BEGINE));
assertTrue("Get a wrong response ",
response.endsWith(RESPONSE_MESSAGE_END));
try {
- response = template.requestBody(simpleEndpointAddress, null,
String.class);
+ template.requestBody(simpleEndpointAddress, null, String.class);
fail("Excpetion to get exception here");
} catch (Exception ex) {
// do nothing here
