[camel] branch master updated: CAMEL-16072: Nicer log summary of startup and shutdown of Camel

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 78e62de  CAMEL-16072: Nicer log summary of startup and shutdown of 
Camel
78e62de is described below

commit 78e62de2e81898ee80eadb038df211fdf33c602d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Jan 24 20:42:01 2021 +0100

    CAMEL-16072: Nicer log summary of startup and shutdown of Camel
---
 .../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index e56b877..a29faf1 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -3138,7 +3138,7 @@ public abstract class AbstractCamelContext extends 
BaseService
     protected void doStop() throws Exception {
         stopWatch.restart();
 
-        if (shutdownStrategy != null) {
+        if (shutdownStrategy != null && shutdownStrategy.getTimeUnit() != 
null) {
             long timeout = 
shutdownStrategy.getTimeUnit().toMillis(shutdownStrategy.getTimeout());
             String to = TimeUtils.printDuration(timeout);
             LOG.info("Apache Camel {} ({}) shutting down (timeout:{})", 
getVersion(), getName(), to);