[camel] branch master updated: Polished

[da...@apache.org]

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 b09f394  Polished
b09f394 is described below

commit b09f394b6c686a39c40e67966e9b03b77b9f5007
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Nov 22 08:30:28 2017 +0100

    Polished
---
 .../main/java/org/apache/camel/impl/DefaultCamelContext.java | 12 +++++-------
 .../src/main/java/org/apache/camel/spi/RouteController.java  |  5 ++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 1055d96..83b1040 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -3191,32 +3191,30 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
                 }
 
                 final Collection<Route> controlledRoutes = getRouteController().getControlledRoutes();
-
                 if (controlledRoutes.isEmpty()) {
                     log.info("Total {} routes, of which {} are started",
                         getRoutes().size(),
                         started);
                 } else {
-                    log.info("Total {} routes, of which {} are started and {} are managed by the route controller ({})",
+                    log.info("Total {} routes, of which {} are started, and {} are managed by RouteController: {}",
                         getRoutes().size(),
                         started,
                         controlledRoutes.size(),
-                        getRouteController().getClass().getName()
+                        getRouteController()
                     );
                 }
-
                 log.info("Apache Camel {} (CamelContext: {}) started in {}", getVersion(), getName(), TimeUtils.printDuration(stopWatch.taken()));
             }
+
+            // okay the routes has been started so emit event that CamelContext has started (here at the end)
             EventHelper.notifyCamelContextStarted(this);
 
-            // now call the startup listeners where the routes has been warmed up
-            // (only the actual route consumer has not yet been started)
+            // now call the startup listeners where the routes has been started
             for (StartupListener startup : startupListeners) {
                 if (startup instanceof ExtendedStartupListener) {
                     ((ExtendedStartupListener) startup).onCamelContextFullyStarted(this, isStarted());
                 }
             }
-
         }
     }
 
diff --git a/camel-core/src/main/java/org/apache/camel/spi/RouteController.java b/camel-core/src/main/java/org/apache/camel/spi/RouteController.java
index b772a7c..b33ccdf 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/RouteController.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/RouteController.java
@@ -24,12 +24,15 @@ import org.apache.camel.Experimental;
 import org.apache.camel.Route;
 import org.apache.camel.Service;
 
+// TODO: Add javadoc
+
 @Experimental
 public interface RouteController extends CamelContextAware, Service {
+
     /**
      * Return the list of routes controlled by this controller.
      *
-     * @return the list of controlled routes;
+     * @return the list of controlled routes
      */
     Collection<Route> getControlledRoutes();
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].