You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/11/12 02:22:05 UTC
svn commit: r713238 - in /activemq/camel/trunk/components/camel-mina/src:
main/java/org/apache/camel/component/mina/
test/java/org/apache/camel/component/mina/
Author: hadrian
Date: Tue Nov 11 17:22:05 2008
New Revision: 713238
URL: http://svn.apache.org/viewvc?rev=713238&view=rev
Log:
CAMEL-1078. Remove MinaExchange.
Removed:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaExchange.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTest.java
Modified:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java?rev=713238&r1=713237&r2=713238&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java Tue Nov 11 17:22:05 2008
@@ -94,7 +94,7 @@
LOG.debug("Received body: " + object);
}
- MinaExchange exchange = endpoint.createExchange(session, object);
+ Exchange exchange = endpoint.createExchange(session, object);
//Set the exchange charset property for converting
if (endpoint.getCharsetName() != null) {
exchange.setProperty(Exchange.CHARSET_NAME, endpoint.getCharsetName());
Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java?rev=713238&r1=713237&r2=713238&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java Tue Nov 11 17:22:05 2008
@@ -25,6 +25,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.impl.DefaultExchange;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoAcceptorConfig;
import org.apache.mina.common.IoConnector;
@@ -80,11 +81,11 @@
@Override
public Exchange createExchange(ExchangePattern pattern) {
- return new MinaExchange(getCamelContext(), pattern, null);
+ return new DefaultExchange(getCamelContext(), pattern);
}
- public MinaExchange createExchange(IoSession session, Object payload) {
- MinaExchange exchange = new MinaExchange(getCamelContext(), getExchangePattern(), session);
+ public Exchange createExchange(IoSession session, Object payload) {
+ Exchange exchange = new DefaultExchange(getCamelContext(), getExchangePattern());
MinaPayloadHelper.setIn(exchange, payload);
return exchange;
}