camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1143996 - in /camel/branches/camel-2.7.x: ./ camel-core/src/main/java/org/apache/camel/processor/ camel-core/src/test/java/org/apache/camel/issues/
Date Thu, 07 Jul 2011 19:38:07 GMT
Author: dkulp
Date: Thu Jul  7 19:38:06 2011
New Revision: 1143996

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

........
  r1094147 | davsclaus | 2011-04-17 10:27:09 -0400 (Sun, 17 Apr 2011) | 1 line
  
  CAMEL-3878: Stopping a route doesnt stop error handlers as they could potentialy be shared
by other routes.
........

Added:
    camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/issues/StopRouteImpactsErrorHandlerTest.java
      - copied unchanged from r1094147, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/StopRouteImpactsErrorHandlerTest.java
    camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/issues/StopRouteShouldNotStopContextScopedErrorHandlerIssueTest.java
      - copied unchanged from r1094147, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/StopRouteShouldNotStopContextScopedErrorHandlerIssueTest.java
    camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/issues/StopRouteShouldNotStopRouteScopedErrorHandlerIssueTest.java
      - copied unchanged from r1094147, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/StopRouteShouldNotStopRouteScopedErrorHandlerIssueTest.java
Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  7 19:38:06 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085905,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925
+/camel/trunk:1083696,1083723-1083724,1084150,1085905,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=1143996&r1=1143995&r2=1143996&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
(original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
Thu Jul  7 19:38:06 2011
@@ -859,7 +859,13 @@ public abstract class RedeliveryErrorHan
 
     @Override
     protected void doStop() throws Exception {
-        ServiceHelper.stopServices(deadLetter, output, outputAsync);
+        // noop, do not stop any services which we only do when shutting down
+        // as the error handler can be context scoped, and should not stop in case
+        // a route stops
     }
 
+    @Override
+    protected void doShutdown() throws Exception {
+        ServiceHelper.stopServices(deadLetter, output, outputAsync);
+    }
 }



Mime
View raw message