Issue #2726: Fix route start up order race condition

Change-Id: I3461f3e7c79ba099eb6c3eafa5b0345aa0fbf585

Former-commit-id: 17b07813ba [formerly 802f537f26d88d43811df7c97382f6082f79a391]
Former-commit-id: 974303044a
This commit is contained in:
Richard Peter 2014-05-19 12:43:56 -05:00
parent f2d8dee5ea
commit 8d3e897cb5

View file

@ -254,7 +254,6 @@ public class ContextManager implements ApplicationContextAware,
try {
ContextData cxtData = getContextData();
List<Future<Pair<CamelContext, Boolean>>> callbacks = new LinkedList<Future<Pair<CamelContext, Boolean>>>();
for (final CamelContext context : cxtData.getContexts()) {
/*
@ -281,7 +280,10 @@ public class ContextManager implements ApplicationContextAware,
def.setStartupOrder(externalCount--);
}
}
}
List<Future<Pair<CamelContext, Boolean>>> callbacks = new LinkedList<Future<Pair<CamelContext, Boolean>>>();
for (final CamelContext context : cxtData.getContexts()) {
final IContextStateManager stateManager = getStateManager(context);
if (stateManager.isContextStartable(context)) {
/*