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 2009/02/28 13:56:13 UTC
svn commit: r748841 - in /camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/processor/
Author: davsclaus
Date: Sat Feb 28 12:56:12 2009
New Revision: 748841
URL: http://svn.apache.org/viewvc?rev=748841&view=rev
Log:
Merged revisions 748821 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r748821 | davsclaus | 2009-02-28 12:34:33 +0100 (Sat, 28 Feb 2009) | 1 line
CAMEL-1406: DelayProcessor now properly supports shutting down while sleeping
........
Added:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
- copied, changed from r748821, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 28 12:56:12 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java?rev=748841&r1=748840&r2=748841&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java Sat Feb 28 12:56:12 2009
@@ -73,7 +73,8 @@
* @param exchange the exchange being processed
*/
protected void waitUntil(long time, Exchange exchange) throws Exception {
- while (true) {
+ // only run is we are started
+ while (isRunAllowed()) {
long delay = time - currentSystemTime();
if (delay < 0) {
return;
@@ -109,7 +110,7 @@
* case differently
*/
protected void handleSleepInteruptedException(InterruptedException e) {
- LOG.debug("Sleep interupted: " + e, e);
+ LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped()));
}
protected long currentSystemTime() {
Modified: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java?rev=748841&r1=748840&r2=748841&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java (original)
+++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java Sat Feb 28 12:56:12 2009
@@ -29,8 +29,7 @@
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(0);
- template.sendBodyAndHeader("seda:a", "<hello>world!</hello>", "JMSTimestamp", System
- .currentTimeMillis());
+ template.sendBodyAndHeader("seda:a", "<hello>world!</hello>", "JMSTimestamp", System.currentTimeMillis());
resultEndpoint.assertIsSatisfied();
// now if we wait a bit longer we should receive the message!
@@ -45,12 +44,6 @@
resultEndpoint.assertIsSatisfied();
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- }
-
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
Copied: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java (from r748821, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java?p2=camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java&r1=748821&r2=748841&rev=748841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java (original)
+++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayerWhileShutdownTest.java Sat Feb 28 12:56:12 2009
@@ -40,8 +40,8 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("seda:a").delay(5000).to("mock:result");
- from("seda:b").delay(10).to("mock:result");
+ from("seda:a").delayer(5000).to("mock:result");
+ from("seda:b").delayer(10).to("mock:result");
}
};
}