Author: dkulp
Date: Fri Jul 8 19:43:32 2011
New Revision: 1144454
URL: http://svn.apache.org/viewvc?rev=1144454&view=rev
Log:
Merged revisions 1094123 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1094123 | davsclaus | 2011-04-17 05:57:02 -0400 (Sun, 17 Apr 2011) | 1 line
CAMEL-3877: Fixed adviceWith when using a context scoped error handler with
XML DSL
........
Added:
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
- copied unchanged from r1094123,
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithContextScopedErrorHandlerIssueTest.java
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
- copied unchanged from r1094123,
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithInvalidConfiguredTest.java
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
- copied unchanged from r1094123,
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AdviceWithRouteScopedErrorHandlerIssueTest.java
camel/branches/camel-2.7.x/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
- copied unchanged from r1094123,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.java
camel/branches/camel-2.7.x/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
- copied unchanged from r1094123,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.java
camel/branches/camel-2.7.x/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
- copied unchanged from r1094123,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithContextScopedErrorHandlerIssueTest.xml
camel/branches/camel-2.7.x/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
- copied unchanged from r1094123,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringAdviceWithRouteScopedErrorHandlerIssueTest.xml
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
camel/branches/camel-2.7.x/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 19:43:32 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,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,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,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,1144248,1144324
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/model/RouteDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1144454&r1=1144453&r2=1144454&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
(original)
+++
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
Fri Jul 8 19:43:32 2011
@@ -222,12 +222,15 @@ public class RouteDefinition extends Pro
}
// we can only advice with a route builder without any routes
- if (!routes.getRoutes().isEmpty()) {
+ if (!builder.getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("You can only advice from a
RouteBuilder which has no existing routes."
+ " Remove all routes from the route builder.");
}
- // we can not advice with error handlers
- if (routes.getErrorHandlerBuilder() != null) {
+ // we can not advice with error handlers (if you added a new error
handler in the route builder)
+ // we must check the error handler on builder is not the same as on
camel context, as that would be the default
+ // context scoped error handler, in case no error handlers was
configured
+ if (builder.getRouteCollection().getErrorHandlerBuilder() != null
+ && camelContext.getErrorHandlerBuilder() !=
builder.getRouteCollection().getErrorHandlerBuilder() ) {
throw new IllegalArgumentException("You can not advice with error
handlers. Remove the error handlers from the route builder.");
}
Modified:
camel/branches/camel-2.7.x/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml?rev=1144454&r1=1144453&r2=1144454&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
(original)
+++
camel/branches/camel-2.7.x/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringPackageTest.xml
Fri Jul 8 19:43:32 2011
@@ -27,6 +27,8 @@
<package>org.apache.camel.spring.issues</package>
<excludes>**/*MyInjectionRouteBuilder*</excludes>
<excludes>**/*SampleInitializingRouteBuilder*</excludes>
+
<excludes>**/*SpringAdviceWithContextScopedErrorHandlerIssueTest*</excludes>
+
<excludes>**/*SpringAdviceWithRouteScopedErrorHandlerIssueTest*</excludes>
<excludes>**/*MyCoolRoute*</excludes>
<excludes>*contextscan*</excludes>
</packageScan>
