Author: davsclaus
Date: Fri Feb 11 05:25:25 2011
New Revision: 1069674
URL: http://svn.apache.org/viewvc?rev=1069674&view=rev
Log:
CAMEL-3639: Fixed sonortype reported issue. Thanks to Tracy Snell for the patch.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1069674&r1=1069673&r2=1069674&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Fri Feb 11 05:25:25 2011
@@ -1748,13 +1748,10 @@ public class DefaultCamelContext extends
for (RouteService routeService : routeServices) {
DefaultRouteStartupOrder order =
doPrepareRouteToBeStarted(routeService);
// check for clash before we add it as input
- if (order != null) {
- if (checkClash && doCheckStartupOrderClash(order, inputs)) {
- inputs.put(order.getStartupOrder(), order);
- } else {
- inputs.put(order.getStartupOrder(), order);
- }
+ if (checkClash) {
+ doCheckStartupOrderClash(order, inputs);
}
+ inputs.put(order.getStartupOrder(), order);
}
// warm up routes before we start them
