You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/11/28 19:44:08 UTC
svn commit: r1414859 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Author: davsclaus
Date: Wed Nov 28 18:44:07 2012
New Revision: 1414859
URL: http://svn.apache.org/viewvc?rev=1414859&view=rev
Log:
CAMEL-5830 fix the NPE when the shutdown the route which is not started rightly.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1414857
Merged /camel/branches/camel-2.10.x:r1414858
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/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1414859&r1=1414858&r2=1414859&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Wed Nov 28 18:44:07 2012
@@ -1811,7 +1811,7 @@ public class DefaultCamelContext extends
protected void logRouteState(Route route, String state) {
if (log.isInfoEnabled()) {
if (route.getConsumer() != null) {
- log.info("Route: {} {}, was consuming from: {}", route.getId(), state, route.getConsumer().getEndpoint());
+ log.info("Route: {} {}, was consuming from: {}", new Object[]{route.getId(), state, route.getConsumer().getEndpoint()});
} else {
log.info("Route: {} {}.", route.getId(), state);
}