svn commit: r1144008 - in /camel/branches/camel-2.7.x: ./ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/test/java/org/apache/camel/processor/intercept/ tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/

[dkulp]

Author: dkulp
Date: Thu Jul  7 19:52:22 2011
New Revision: 1144008

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

........
  r1085909 | davsclaus | 2011-03-27 06:59:29 -0400 (Sun, 27 Mar 2011) | 1 line
  
  CAMEL-3795: Added unit test
........
  r1087005 | davsclaus | 2011-03-30 12:14:37 -0400 (Wed, 30 Mar 2011) | 1 line
  
  CAMEL-3795: Fixed issue with intercept send to endpoint with ftp endpoints 
causing the interceptor to be stopped.
........

Added:
    
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/processor/intercept/RecipientListInterceptSendToEndpointException.java
      - copied unchanged from r1085909, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/RecipientListInterceptSendToEndpointException.java
    
camel/branches/camel-2.7.x/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
      - copied unchanged from r1087005, 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
Modified:
    camel/branches/camel-2.7.x/   (props changed)
    
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  7 19:52:22 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,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
+/camel/trunk:1083696,1083723-1083724,1084150,1085905,1085909,1086231,1087005,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

Modified: 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java?rev=1144008&r1=1144007&r2=1144008&view=diff
==============================================================================
--- 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
 (original)
+++ 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
 Thu Jul  7 19:52:22 2011
@@ -154,7 +154,7 @@ public class InterceptSendToEndpoint imp
             }
 
             public void stop() throws Exception {
-                ServiceHelper.stopService(detour);
+                // do not stop detour as it should only be stopped when the 
interceptor stops
             }
         };
     }
@@ -188,11 +188,11 @@ public class InterceptSendToEndpoint imp
     }
 
     public void start() throws Exception {
-        delegate.start();
+        ServiceHelper.startServices(detour, delegate);
     }
 
     public void stop() throws Exception {
-        delegate.stop();
+        ServiceHelper.stopServices(delegate, detour);
     }
 
     @Override