Author: hadrian
Date: Mon Apr 2 19:16:15 2012
New Revision: 1308479
URL: http://svn.apache.org/viewvc?rev=1308479&view=rev
Log:
Merged revisions 1302094 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1302094 | davsclaus | 2012-03-18 04:34:18 -0400 (Sun, 18 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
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=1308479&r1=1308478&r2=1308479&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:16:15 2012
@@ -46,7 +46,7 @@ public class TimerComponent extends Defa
answer = timers.get(key);
if (answer == null) {
// the timer name is also the thread name, so lets resolve a
name to be used
- String name =
endpoint.getCamelContext().getExecutorServiceManager().resolveThreadName(endpoint.getTimerName());
+ String name =
endpoint.getCamelContext().getExecutorServiceManager().resolveThreadName("timer://"
+ endpoint.getTimerName());
answer = new Timer(name, endpoint.isDaemon());
timers.put(key, answer);
}