svn commit: r1208258 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java

[ffang]

Author: ffang
Date: Wed Nov 30 04:05:36 2011
New Revision: 1208258

URL: http://svn.apache.org/viewvc?rev=1208258&view=rev
Log:
Merged revisions 1208231 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1208231 | ffang | 2011-11-30 11:18:23 +0800 (三, 30 11 2011) | 1 line
  
  [CAMEL-4727]keep consistent for CamelContext:  output
........

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/
------------------------------------------------------------------------------
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=1208258&r1=1208257&r2=1208258&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
 Wed Nov 30 04:05:36 2011
@@ -1463,7 +1463,7 @@ public class DefaultCamelContext extends
 
     protected synchronized void doStop() throws Exception {
         stopWatch.restart();
-        log.info("Apache Camel " + getVersion() + " (CamelContext:" + 
getName() + ") is shutting down");
+        log.info("Apache Camel " + getVersion() + " (CamelContext: " + 
getName() + ") is shutting down");
         EventHelper.notifyCamelContextStopping(this);
 
         // stop route inputs in the same order as they was started so we stop 
the very first inputs first