diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java index 3d92f70f87077..7cdc20e26b196 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java @@ -137,6 +137,10 @@ public void setDefaultThreadPoolProfile(ThreadPoolProfile defaultThreadPoolProfi @Override public String getThreadNamePattern() { + if (threadNamePattern == null) { + // set default name pattern which includes the camel context name + threadNamePattern = "Camel (" + camelContext.getName() + ") thread ##counter# - #name#"; + } return threadNamePattern; } @@ -162,7 +166,7 @@ public void setShutdownAwaitTermination(long shutdownAwaitTermination) { @Override public String resolveThreadName(String name) { - return ThreadHelper.resolveThreadName(threadNamePattern, name); + return ThreadHelper.resolveThreadName(getThreadNamePattern(), name); } @Override @@ -443,11 +447,6 @@ protected void onNewExecutorService(ExecutorService executorService) { protected void doInit() throws Exception { super.doInit(); - if (threadNamePattern == null) { - // set default name pattern which includes the camel context name - threadNamePattern = "Camel (" + camelContext.getName() + ") thread ##counter# - #name#"; - } - // discover thread pool factory if (threadPoolFactory == null) { threadPoolFactory = ResolverHelper.resolveService( @@ -611,7 +610,7 @@ private void onThreadPoolCreated(ExecutorService executorService, Object source, } protected ThreadFactory createThreadFactory(Object source, String name, boolean daemon) { - ThreadFactory factory = new CamelThreadFactory(threadNamePattern, name, daemon); + ThreadFactory factory = new CamelThreadFactory(getThreadNamePattern(), name, daemon); for (ThreadFactoryListener listener : threadFactoryListeners) { factory = listener.onNewThreadFactory(source, factory); }