You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/12/03 15:13:49 UTC
svn commit: r722895 - in /activemq/camel/trunk/components/camel-mina/src:
main/java/org/apache/camel/component/mina/MinaProducer.java
test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
Author: davsclaus
Date: Wed Dec 3 06:13:48 2008
New Revision: 722895
URL: http://svn.apache.org/viewvc?rev=722895&view=rev
Log:
CAMEL-1140: MinaProducer now throws CamelExchangeException if no message received from remote server when sync=true
Modified:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java?rev=722895&r1=722894&r2=722895&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java Wed Dec 3 06:13:48 2008
@@ -20,11 +20,10 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.CamelException;
+import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.Producer;
-import org.apache.camel.CamelExchangeException;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.ExchangeHelper;
import org.apache.commons.logging.Log;
@@ -104,7 +103,7 @@
// did we get a response
ResponseHandler handler = (ResponseHandler) session.getHandler();
if (handler.getCause() != null) {
- throw new CamelException("Response Handler had an exception", handler.getCause());
+ throw new CamelExchangeException("Response Handler had an exception", exchange, handler.getCause());
} else if (!handler.isMessageRecieved()) {
// no message received
throw new CamelExchangeException("No response received from remote server: " + endpoint.getEndpointUri(), exchange);
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java?rev=722895&r1=722894&r2=722895&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java Wed Dec 3 06:13:48 2008
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.mina;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.CamelExchangeException;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;