svn commit: r1301375 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/timer/TimerComponent.java test/java/org/apache/camel/component/timer/TimerRouteTest.java

[davsclaus]

Author: davsclaus
Date: Fri Mar 16 08:29:01 2012
New Revision: 1301375

URL: http://svn.apache.org/viewvc?rev=1301375&view=rev
Log:
CAMEL-5099: Timer thread should use same thread name pattern as the others.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java?rev=1301375&r1=1301374&r2=1301375&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
 Fri Mar 16 08:29:01 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/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java?rev=1301375&r1=1301374&r2=1301375&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
 Fri Mar 16 08:29:01 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");
             }
         };
     }