xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2726: Fix route start up order race condition

Browse source 
Change-Id: I3461f3e7c79ba099eb6c3eafa5b0345aa0fbf585

Former-commit-id: 74f1c41e68 [formerly 17b07813ba] [formerly 74f1c41e68 [formerly 17b07813ba] [formerly 974303044a [formerly 802f537f26d88d43811df7c97382f6082f79a391]]]
Former-commit-id: 974303044a
Former-commit-id: 696cf7e8c6 [formerly 8d3e897cb5]
Former-commit-id: 77b7ad1a7e
This commit is contained in:
Richard Peter 2014-05-19 12:43:56 -05:00
parent 35ac239778
commit f56a989679
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
View file

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