You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/03/15 11:06:13 UTC
svn commit: r923142 - in
/servicemix/components/engines/servicemix-camel/trunk/src:
main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
Author: gertv
Date: Mon Mar 15 10:06:13 2010
New Revision: 923142
URL: http://svn.apache.org/viewvc?rev=923142&view=rev
Log:
SMXCOMP-719: CamelProviderEndpoint does not copy Camel out headers into a JBI Fault message
Modified:
servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
Modified: servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java?rev=923142&r1=923141&r2=923142&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java Mon Mar 15 10:06:13 2010
@@ -145,7 +145,7 @@ public class CamelProviderEndpoint exten
try {
if (exchange.hasOut()) {
Fault fault = me.createFault();
- fault.setContent(exchange.getOut().getBody(Source.class));
+ binding.copyFromCamelToJbi(exchange.getOut(), fault);
if (isFaultCapable(me)) {
me.setFault(fault);
doSend(me);
Modified: servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java?rev=923142&r1=923141&r2=923142&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java (original)
+++ servicemix/components/engines/servicemix-camel/trunk/src/test/java/org/apache/servicemix/camel/JbiInOutFaultTest.java Mon Mar 15 10:06:13 2010
@@ -31,6 +31,10 @@ import org.apache.servicemix.jbi.FaultEx
* @version $Revision: 1.1 $
*/
public class JbiInOutFaultTest extends NonJbiCamelEndpointsIntegrationTest {
+
+ private static final String KEY = "fault.key";
+ private static final String VALUE = "fault.value";
+
/*
* @see TestCase#setUp()
*/
@@ -43,6 +47,7 @@ public class JbiInOutFaultTest extends N
protected boolean transform(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out) throws MessagingException {
Fault f = exchange.createFault();
f.setContent(new StringSource("<fault/>"));
+ f.setProperty(KEY, VALUE);
throw new FaultException("Error", exchange, f);
}
};
@@ -62,8 +67,10 @@ public class JbiInOutFaultTest extends N
@Override
protected void checkResult(MessageExchange exchange) {
- assertNotNull(exchange.getMessage("fault"));
- assertNotNull(exchange.getMessage("fault").getContent());
- }
+ NormalizedMessage fault = exchange.getMessage("fault");
-}
\ No newline at end of file
+ assertNotNull(fault);
+ assertNotNull(fault.getContent());
+ assertEquals(VALUE, fault.getProperty(KEY));
+ }
+}