You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/01/04 14:57:46 UTC
svn commit: r1428860 - in
/camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration:
SpringIntegrationConsumer.java SpringIntegrationProducer.java
Author: cmueller
Date: Fri Jan 4 13:57:46 2013
New Revision: 1428860
URL: http://svn.apache.org/viewvc?rev=1428860&view=rev
Log:
CAMEL-5926: SpringIntegrationConsumer should honor the 'inOut' instance variable by setting the MEP and sending back message headers
Modified:
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
Modified: camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=1428860&r1=1428859&r2=1428860&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java Fri Jan 4 13:57:46 2013
@@ -131,7 +131,7 @@ public class SpringIntegrationConsumer
}
// put the message back the outputChannel if we need
- org.springframework.integration.Message siOutMessage =
+ org.springframework.integration.Message<?> siOutMessage =
SpringIntegrationBinding.storeToSpringIntegrationMessage(exchange.getOut());
// send the message to spring integration
Modified: camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java?rev=1428860&r1=1428859&r2=1428860&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java Fri Jan 4 13:57:46 2013
@@ -100,7 +100,7 @@ public class SpringIntegrationProducer e
}
});
}
- org.springframework.integration.Message siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
+ org.springframework.integration.Message<Object> siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
// send the message to spring integration
log.debug("Sending {} to OutputChannel: {}", siOutmessage, outputChannel);