Author: davsclaus
Date: Tue Oct 21 07:32:21 2008
New Revision: 706639
URL: http://svn.apache.org/viewvc?rev=706639&view=rev
Log:
CAMEL-1003: seda consumer will put message back on queue in the rare cases it
was stopped while it polled an exchange (to not lose it). Added unit test to
demonstrate this (based on end user wanting to stop consuming from a seda queue)
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
(with props)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?rev=706639&r1=706638&r2=706639&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
Tue Oct 21 07:32:21 2008
@@ -70,6 +70,15 @@
} catch (Exception e) {
LOG.error("Seda queue caught: " + e, e);
}
+ } else {
+ LOG.warn("This consumer is stopped during polling an exchange,
so putting it back on the seda queue: " + exchange);
+ try {
+ endpoint.getQueue().put(exchange);
+ } catch (InterruptedException e) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Interupted: " + e, e);
+ }
+ }
}
}
}
@@ -82,6 +91,7 @@
protected void doStop() throws Exception {
thread.join();
+ thread = null;
}
}
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java?rev=706639&view=auto
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
(added)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
Tue Oct 21 07:32:21 2008
@@ -0,0 +1,88 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.seda;
+
+import java.util.Random;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.PollingConsumer;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+/**
+ * Unit test to verify that we can stop and start a seda consumer while a
producer
+ * continues to send messages to it.
+ */
+public class SedaConsumerStartStopTest extends ContextTestSupport {
+
+ private PollingConsumer consumer;
+
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ private void sendMessagesToQueue() throws Exception {
+ ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+ executor.afterPropertiesSet();
+ executor.execute(new Runnable() {
+ public void run() {
+ for (int i = 0; i < 20; i++) {
+ try {
+ // do some random sleep to simulate spread in user
activity
+ Thread.sleep(new Random().nextInt(10));
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ template.sendBody("seda:queue", i);
+ }
+ };
+ });
+ }
+
+ public void initRoute() throws Exception {
+ Endpoint endpoint = context.getEndpoint("seda:queue");
+ consumer = endpoint.createPollingConsumer();
+ }
+
+ public void testStartStopConsumer() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(20);
+ mock.expectsAscending(body());
+
+ initRoute();
+ // will send messages to the queue in another thread simulation a
producer
+ sendMessagesToQueue();
+
+ consumer.start();
+ for (int i = 0; i < 20; i++) {
+ if (i == 10) {
+ // stop while sending, and then start again to pickup what is
left in the queue
+ consumer.stop();
+ Thread.sleep(1000);
+ consumer.start();
+ }
+ // use 1000 as timeout otherwise we might get null if the consumer
hasn't been started again
+ Exchange exchange = consumer.receive(1000);
+ template.send("mock:result", exchange);
+ }
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
