You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 22:07:48 UTC

svn commit: r1172787 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java

Author: dkulp
Date: Mon Sep 19 20:07:48 2011
New Revision: 1172787

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

........
  r1153816 | davsclaus | 2011-08-04 05:55:18 -0400 (Thu, 04 Aug 2011) | 1 line
  
  CAMEL-4296: Added javadoc note about usage of adviceWith
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
    camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java

Propchange: camel/branches/camel-2.8.x/
            ('svn:mergeinfo' removed)

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/builder/AdviceWithRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java?rev=1172787&r1=1172786&r2=1172787&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java Mon Sep 19 20:07:48 2011
@@ -27,6 +27,10 @@ import org.apache.camel.util.ObjectHelpe
 /**
  * A {@link RouteBuilder} which has extended capabilities when using
  * the <a href="http://camel.apache.org/advicewith.html">advice with</a> feature.
+ * <p/>
+ * <b>Important:</b> It is recommended to only advice a given route once (you can of course advice multiple routes).
+ * If you do it multiple times, then it may not work as expected, especially when any kind of error handling is involved.
+ * The Camel team plan for Camel 3.0 to support this as internal refactorings in the routing engine is needed to support this properly.
  *
  * @see org.apache.camel.model.RouteDefinition#adviceWith(org.apache.camel.CamelContext, RouteBuilder)
  */

Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1172787&r1=1172786&r2=1172787&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Mon Sep 19 20:07:48 2011
@@ -183,6 +183,10 @@ public class RouteDefinition extends Pro
     /**
      * Advices this route with the route builder.
      * <p/>
+     * <b>Important:</b> It is recommended to only advice a given route once (you can of course advice multiple routes).
+     * If you do it multiple times, then it may not work as expected, especially when any kind of error handling is involved.
+     * The Camel team plan for Camel 3.0 to support this as internal refactorings in the routing engine is needed to support this properly.
+     * <p/>
      * You can use a regular {@link RouteBuilder} but the specialized {@link org.apache.camel.builder.AdviceWithRouteBuilder}
      * has additional features when using the <a href="http://camel.apache.org/advicewith.html">advice with</a> feature.
      * We therefore suggest you to use the {@link org.apache.camel.builder.AdviceWithRouteBuilder}.