You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/06/29 13:46:14 UTC
svn commit: r1355328 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/test/java/org/apache/camel/impl/
components/camel-spring/src/test/java/org/apache/camel/spring/impl/
components/camel-spring/src/te...
Author: davsclaus
Date: Fri Jun 29 11:46:12 2012
New Revision: 1355328
URL: http://svn.apache.org/viewvc?rev=1355328&view=rev
Log:
CAMEL-5401: Fixed route policy ref not working with all callbacks being invoked.
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyRefCallbackTest.java
- copied unchanged from r1355326, camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyRefCallbackTest.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.java
- copied unchanged from r1355326, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.xml
- copied unchanged from r1355326, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringRoutePolicyRefCallbackTest.xml
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyCallbackTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1355326
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java?rev=1355328&r1=1355327&r2=1355328&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/RouteService.java Fri Jun 29 11:46:12 2012
@@ -170,8 +170,8 @@ public class RouteService extends ChildS
ServiceHelper.startService(route);
// invoke callbacks on route policy
- if (routeDefinition.getRoutePolicies() != null) {
- for (RoutePolicy routePolicy : routeDefinition.getRoutePolicies()) {
+ if (route.getRouteContext().getRoutePolicyList() != null) {
+ for (RoutePolicy routePolicy : route.getRouteContext().getRoutePolicyList()) {
routePolicy.onStart(route);
}
}
@@ -215,8 +215,8 @@ public class RouteService extends ChildS
}
// invoke callbacks on route policy
- if (routeDefinition.getRoutePolicies() != null) {
- for (RoutePolicy routePolicy : routeDefinition.getRoutePolicies()) {
+ if (route.getRouteContext().getRoutePolicyList() != null) {
+ for (RoutePolicy routePolicy : route.getRouteContext().getRoutePolicyList()) {
routePolicy.onStop(route);
}
}
@@ -254,8 +254,8 @@ public class RouteService extends ChildS
// see more details in the warmUp method
ServiceHelper.stopAndShutdownServices(route.getEndpoint());
// invoke callbacks on route policy
- if (routeDefinition.getRoutePolicies() != null) {
- for (RoutePolicy routePolicy : routeDefinition.getRoutePolicies()) {
+ if (route.getRouteContext().getRoutePolicyList() != null) {
+ for (RoutePolicy routePolicy : route.getRouteContext().getRoutePolicyList()) {
routePolicy.onRemove(route);
}
}
@@ -285,8 +285,8 @@ public class RouteService extends ChildS
// suspend and resume logic is provided by DefaultCamelContext which leverages ShutdownStrategy
// to safely suspend and resume
for (Route route : routes) {
- if (routeDefinition.getRoutePolicies() != null) {
- for (RoutePolicy routePolicy : routeDefinition.getRoutePolicies()) {
+ if (route.getRouteContext().getRoutePolicyList() != null) {
+ for (RoutePolicy routePolicy : route.getRouteContext().getRoutePolicyList()) {
routePolicy.onSuspend(route);
}
}
@@ -298,8 +298,8 @@ public class RouteService extends ChildS
// suspend and resume logic is provided by DefaultCamelContext which leverages ShutdownStrategy
// to safely suspend and resume
for (Route route : routes) {
- if (routeDefinition.getRoutePolicies() != null) {
- for (RoutePolicy routePolicy : routeDefinition.getRoutePolicies()) {
+ if (route.getRouteContext().getRoutePolicyList() != null) {
+ for (RoutePolicy routePolicy : route.getRouteContext().getRoutePolicyList()) {
routePolicy.onResume(route);
}
}
Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyCallbackTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyCallbackTest.java?rev=1355328&r1=1355327&r2=1355328&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyCallbackTest.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyCallbackTest.java Fri Jun 29 11:46:12 2012
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBui
*/
public class RoutePolicyCallbackTest extends ContextTestSupport {
- private MyRoutePolicy policy = new MyRoutePolicy();
+ protected MyRoutePolicy policy = new MyRoutePolicy();
public static class MyRoutePolicy extends RoutePolicySupport {
@@ -92,7 +92,13 @@ public class RoutePolicyCallbackTest ext
}
}
+ protected MyRoutePolicy getAndInitMyRoutePolicy() {
+ return policy;
+ }
+
public void testCallback() throws Exception {
+ policy = getAndInitMyRoutePolicy();
+
assertTrue(policy.doStart);
assertTrue(policy.init);