svn commit: r925987 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: AsyncProcessor.java impl/DefaultShutdownStrategy.java

[davsclaus]

Author: davsclaus
Date: Mon Mar 22 07:44:17 2010
New Revision: 925987

URL: http://svn.apache.org/viewvc?rev=925987&view=rev
Log:
Logging cause exception at WARN if shutdown route failed. Fixed spelling.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java?rev=925987&r1=925986&r2=925987&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java 
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/AsyncProcessor.java 
Mon Mar 22 07:44:17 2010
@@ -20,7 +20,7 @@ package org.apache.camel;
  * An <b>asynchronous</b> processor which can process an {...@link Exchange} 
in an asynchronous fashion
  * and signal completion by invoking the {...@link AsyncCallback}.
  * <p/>
- * For example {...@link Producer} can implmenet this interface to support 
real asynchronous non blocking
+ * For example {...@link Producer} can implement this interface to support 
real asynchronous non blocking
  * when using the {...@link org.apache.camel.processor.SendAsyncProcessor}.
  *
  * @version $Revision$

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java?rev=925987&r1=925986&r2=925987&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
 Mon Mar 22 07:44:17 2010
@@ -103,7 +103,7 @@ public class DefaultShutdownStrategy ext
                 // force the routes to shutdown now
                 shutdownRoutesNow(routes);
             } else {
-                LOG.warn("Timeout occurred. Will ignore shutting down the 
remainder route input consumers.");
+                LOG.warn("Timeout occurred. Will ignore shutting down the 
remainder routes.");
             }
         } catch (ExecutionException e) {
             // unwrap execution exception
@@ -196,8 +196,8 @@ public class DefaultShutdownStrategy ext
         // allow us to do custom work before delegating to service helper
         try {
             ServiceHelper.stopService(consumer);
-        } catch (Exception e) {
-            LOG.warn("Error occurred while shutting down route: " + consumer + 
". This exception will be ignored.");
+        } catch (Throwable e) {
+            LOG.warn("Error occurred while shutting down route: " + consumer + 
". This exception will be ignored.", e);
             // fire event
             
EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), 
consumer, e);
         }
@@ -220,8 +220,8 @@ public class DefaultShutdownStrategy ext
 
         try {
             service.suspend();
-        } catch (Exception e) {
-            LOG.warn("Error occurred while suspending route: " + consumer + ". 
This exception will be ignored.");
+        } catch (Throwable e) {
+            LOG.warn("Error occurred while suspending route: " + consumer + ". 
This exception will be ignored.", e);
             // fire event
             
EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), 
consumer, e);
         }