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 2012/04/02 21:12:30 UTC
svn commit: r1308472 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
Author: hadrian
Date: Mon Apr 2 19:12:30 2012
New Revision: 1308472
URL: http://svn.apache.org/viewvc?rev=1308472&view=rev
Log:
Merged revisions 1301375 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1301375 | davsclaus | 2012-03-16 04:29:01 -0400 (Fri, 16 Mar 2012) | 1 line
CAMEL-5099: Timer thread should use same thread name pattern as the others.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java?rev=1308472&r1=1308471&r2=1308472&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java Mon Apr 2 19:12:30 2012
@@ -45,7 +45,9 @@ public class TimerComponent extends Defa
synchronized (timers) {
answer = timers.get(key);
if (answer == null) {
- answer = new Timer(endpoint.getTimerName(), endpoint.isDaemon());
+ // the timer name is also the thread name, so lets resolve a name to be used
+ String name = endpoint.getCamelContext().getExecutorServiceManager().resolveThreadName(endpoint.getTimerName());
+ answer = new Timer(name, endpoint.isDaemon());
timers.put(key, answer);
}
}
Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java?rev=1308472&r1=1308471&r2=1308472&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java Mon Apr 2 19:12:30 2012
@@ -46,7 +46,9 @@ public class TimerRouteTest extends Cont
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("timer://foo?fixedRate=true&delay=0&period=500").to("bean:myBean", "mock:result");
+ from("timer://foo?fixedRate=true&delay=0&period=500")
+ .log("Fired timer")
+ .to("bean:myBean", "mock:result");
}
};
}