You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/12/06 05:47:28 UTC
svn commit: r1210779 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Author: ningjiang
Date: Tue Dec 6 04:47:28 2011
New Revision: 1210779
URL: http://svn.apache.org/viewvc?rev=1210779&view=rev
Log:
Merged revisions 1210771 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1210771 | ningjiang | 2011-12-06 11:47:48 +0800 (Tue, 06 Dec 2011) | 1 line
CAMEL-4744 Improve log message when starting Camel with routes having autoStartup=false
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 6 04:47:28 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1210779&r1=1210778&r2=1210779&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Tue Dec 6 04:47:28 2011
@@ -1452,7 +1452,7 @@ public class DefaultCamelContext extends
// start routes
if (doNotStartRoutesOnFirstStart) {
- log.info("Cannot start routes as CamelContext has been configured with autoStartup=false");
+ log.debug("Skip starting of routes as CamelContext has been configured with autoStartup=false");
}
// invoke this logic to warmup the routes and if possible also start the routes
@@ -1876,7 +1876,7 @@ public class DefaultCamelContext extends
// if we are starting camel, then skip routes which are configured to not be auto started
boolean autoStartup = routeService.getRouteDefinition().isAutoStartup(this);
if (addingRoute && !autoStartup) {
- log.info("Cannot start route " + routeService.getId() + " as its configured with autoStartup=false");
+ log.info("Skipping starting of route " + routeService.getId() + " as its configured with autoStartup=false");
continue;
}